hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ddl fix log print of set_commit_sucess

Browse Source
This commit is contained in:
simonjoylet
2023-01-05 03:08:17 +00:00
committed by ob-robot
parent a09a9911fe
commit 003bed9ba0
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/ddl/ob_ddl_merge_task.cpp
View File

@ -416,7 +416,9 @@ int ObDDLTableMergeTask::process()
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->set_commit_success(merge_param_.start_scn_))) {
LOG_WARN("set is commit success failed", K(ret));
if (OB_EAGAIN != ret) {
LOG_WARN("set is commit success failed", K(ret));
}
} else {
LOG_INFO("commit ddl sstable succ", K(ddl_param), K(merge_param_));
}

11
src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp
View File

@ -310,8 +310,15 @@ int ObTabletDDLKvMgr::set_commit_success(const SCN &start_scn)
ret = OB_TASK_EXPIRED;
LOG_WARN("ddl task expired", K(ret), K(start_scn), K(*this));
} else if (OB_UNLIKELY(start_scn > start_scn_)) {
ret = OB_ERR_SYS;
LOG_WARN("sucess start log ts too large", K(ret), K(start_scn), K(*this));
if (start_scn_.is_valid_and_not_min()) {
ret = OB_ERR_SYS;
LOG_WARN("sucess start log ts too large", K(ret), K(start_scn), K(*this));
} else {
ret = OB_EAGAIN;
if (REACH_TIME_INTERVAL(1000L * 1000L * 60L)) {
LOG_INFO("ddl start scn is invalid, maybe migration has offlined the logstream", K(*this));
}
}
} else {
success_start_scn_ = start_scn;
}