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

skip obsolete ddl log; when write ddl commit log, get direct load mgr handle of lob meta tablet manually

Browse Source
This commit is contained in:
simonjoylet 2024-11-18 05:47:33 +00:00 committed by ob-robot
parent 0f7bfe225e
commit fe7e70a714
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/storage/ddl/ob_ddl_redo_log_writer.cpp
View File

@ -1493,8 +1493,25 @@ int ObDDLRedoLogWriter::write_commit_log(
commit_scn = direct_load_mgr_handle.get_obj()->get_commit_scn(tablet_handle.get_obj()->get_tablet_meta());
LOG_WARN("already committed", K(ret), K(start_scn), K(commit_scn), K(direct_load_mgr_handle.get_obj()->get_start_scn()), K(log));
} else if (!remote_write_) {
ObTabletDirectLoadMgrHandle &lob_direct_load_mgr_handle = direct_load_mgr_handle.get_obj()->get_lob_mgr_handle();
if (OB_FAIL(local_write_ddl_commit_log(
// direct load mgr handle of lob meta tablet may not bind to data tablet handle, get it manually here
ObTabletBindingMdsUserData ddl_data;
ObTabletDirectLoadMgrHandle lob_direct_load_mgr_handle;
if (OB_FAIL(tablet_handle.get_obj()->ObITabletMdsInterface::get_ddl_data(share::SCN::max_scn(), ddl_data))) {
LOG_WARN("failed to get ddl data from tablet", K(ret), K(tablet_handle));
} else if (ddl_data.lob_meta_tablet_id_.is_valid()) {
bool is_lob_major_sstable_exist = false;
if (OB_FAIL(MTL(ObTenantDirectLoadMgr *)->get_tablet_mgr_and_check_major(ls_id_, ddl_data.lob_meta_tablet_id_,
true/* is_full_direct_load */, lob_direct_load_mgr_handle, is_lob_major_sstable_exist))) {
if (OB_ENTRY_NOT_EXIST == ret && is_lob_major_sstable_exist) {
ret = OB_SUCCESS;
LOG_INFO("lob meta tablet exist major sstable, skip", K(ret), K(ddl_data.lob_meta_tablet_id_));
} else {
LOG_WARN("get tablet mgr failed", K(ret), K(ddl_data.lob_meta_tablet_id_));
}
}
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(local_write_ddl_commit_log(
log, ObDDLClogType::DDL_COMMIT_LOG, ls_id_, ls->get_log_handler(), direct_load_mgr_handle, lob_direct_load_mgr_handle, handle, lock_tid))) {
if (ObDDLUtil::need_remote_write(ret) && allow_remote_write) {
if (OB_FAIL(switch_to_remote_write())) {

14
src/storage/ddl/ob_ddl_replay_executor.cpp
View File

@ -212,7 +212,12 @@ int ObDDLStartReplayExecutor::do_replay_(ObTabletHandle &tablet_handle)
const bool replay_allow_tablet_not_exist = true;
if (OB_FAIL(ls_->replay_get_tablet_no_check(lob_meta_tablet_id, scn_,
replay_allow_tablet_not_exist, lob_meta_tablet_handle))) {
LOG_WARN("get tablet handle failed", K(ret), K(lob_meta_tablet_id), K(scn_));
if (OB_OBSOLETE_CLOG_NEED_SKIP == ret) {
LOG_INFO("clog is already obsolete, should skip replay", K(ret), K(lob_meta_tablet_id), K(scn_));
ret = OB_SUCCESS;
} else {
LOG_WARN("get tablet handle failed", K(ret), K(lob_meta_tablet_id), K(scn_));
}
} else if (OB_FAIL(replay_ddl_start(lob_meta_tablet_handle, true/*is_lob_meta_tablet*/))) {
LOG_WARN("replay ddl start for lob meta tablet failed", K(ret), K(lob_meta_tablet_id), K(scn_));
}
@ -703,7 +708,12 @@ int ObDDLCommitReplayExecutor::do_replay_(ObTabletHandle &tablet_handle)
const bool replay_allow_tablet_not_exist = true;
if (OB_FAIL(ls_->replay_get_tablet_no_check(lob_meta_tablet_id, scn_,
replay_allow_tablet_not_exist, lob_meta_tablet_handle))) {
LOG_WARN("get tablet handle failed", K(ret), K(lob_meta_tablet_id), K(scn_));
if (OB_OBSOLETE_CLOG_NEED_SKIP == ret) {
LOG_INFO("clog is already obsolete, should skip replay", K(ret), K(lob_meta_tablet_id), K(scn_));
ret = OB_SUCCESS;
} else {
LOG_WARN("get tablet handle failed", K(ret), K(lob_meta_tablet_id), K(scn_));
}
} else if (OB_FAIL(replay_ddl_commit(lob_meta_tablet_handle))) {
LOG_WARN("replay ddl start for lob meta tablet failed", K(ret), K(lob_meta_tablet_id), K(scn_));
}