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

do not freeze ddl kv when schedule dag

Browse Source
This commit is contained in:
Charles0429
2024-02-10 09:35:41 +00:00
committed by ob-robot
parent e1bc7f780d
commit 3515680aab
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,9 +110,6 @@ int ObDDLTableMergeDag::create_first_task()
&& ddl_param_.start_scn_ < tablet_handle.get_obj()->get_tablet_meta().ddl_start_scn_) {
ret = OB_TASK_EXPIRED;
LOG_WARN("ddl task expired, skip it", K(ret), K(ddl_param_), "new_start_scn", tablet_handle.get_obj()->get_tablet_meta().ddl_start_scn_);
} else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->freeze_ddl_kv(
ddl_param_.start_scn_, ddl_param_.snapshot_version_, ddl_param_.data_format_version_))) {
LOG_WARN("ddl kv manager try freeze failed", K(ret), K(ddl_param_));
} else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->get_ddl_kvs(true/*frozen_only*/, ddl_kvs_handle))) {
LOG_WARN("get freezed ddl kv failed", K(ret), K(ddl_param_));
} else if (OB_FAIL(alloc_task(merge_task))) {

9
src/storage/ls/ob_ls_ddl_log_handler.cpp
View File

@ -409,15 +409,12 @@ int ObLSDDLLogHandler::flush(SCN &rec_scn)
param.data_format_version_ = direct_load_mgr_hdl.get_full_obj()->get_data_format_version();
param.snapshot_version_ = direct_load_mgr_hdl.get_full_obj()->get_table_key().get_snapshot_version();
LOG_INFO("schedule ddl merge dag", K(param));
if (OB_FAIL(compaction::ObScheduleDagFunc::schedule_ddl_table_merge_dag(param))) {
if (OB_EAGAIN != ret && OB_SIZE_OVERFLOW != ret) {
LOG_WARN("failed to schedule ddl kv merge dag", K(ret));
} else {
ret = OB_SUCCESS;
}
if (OB_FAIL(ObTabletDDLUtil::freeze_ddl_kv(param))) {
LOG_WARN("try to freeze ddl kv failed", K(ret), K(param));
}
}
}
(void)tenant_direct_load_mgr->gc_tablet_direct_load();
}
}
return OB_SUCCESS;