提交 6d566658 编写于 作者: O obdev 提交者: ob-robot

[BugFix] fix frequent freeze

上级 6892b58c
......@@ -218,10 +218,6 @@ int ObCheckpointExecutor::advance_checkpoint_by_flush(SCN recycle_scn) {
K(calcu_recycle_lsn), K(ls_->get_ls_id()));
}
}
// the log of end_log_lsn and the log of clog_checkpoint_lsn may be in a block
if (recycle_scn < ls_->get_clog_checkpoint_scn()) {
recycle_scn.set_max();
}
}
if (OB_SUCC(ret)) {
......
......@@ -787,7 +787,7 @@ int ObDataCheckpoint::freeze_base_on_needs_(share::SCN recycle_scn)
}
if (logstream_freeze) {
if (OB_FAIL(ls_->logstream_freeze())) {
if (OB_FAIL(ls_->logstream_freeze(true/*is_sync*/))) {
STORAGE_LOG(WARN, "minor freeze failed", K(ret), K(ls_->get_ls_id()));
}
} else {
......
......@@ -1346,7 +1346,7 @@ int ObLS::logstream_freeze(bool is_sync)
}
}
if (is_sync) {
if (OB_SUCC(ret) && is_sync) {
ret = ls_freezer_.wait_freeze_finished(result);
}
......@@ -1378,7 +1378,7 @@ int ObLS::tablet_freeze(const ObTabletID &tablet_id, bool is_sync)
}
}
if (is_sync) {
if (OB_SUCC(ret) && is_sync) {
ret = ls_freezer_.wait_freeze_finished(result);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册