From ef32051b1e9606b8cb193c46b1d1223ab72812c1 Mon Sep 17 00:00:00 2001 From: simonjoylet Date: Mon, 6 Feb 2023 15:07:39 +0800 Subject: [PATCH] fix log of expired ddl merge task --- src/storage/ddl/ob_ddl_merge_task.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/ddl/ob_ddl_merge_task.cpp b/src/storage/ddl/ob_ddl_merge_task.cpp index cb9499abe7..203c4f0f8b 100644 --- a/src/storage/ddl/ob_ddl_merge_task.cpp +++ b/src/storage/ddl/ob_ddl_merge_task.cpp @@ -372,6 +372,7 @@ int ObDDLTableMergeTask::process() } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->get_ddl_param(ddl_param))) { LOG_WARN("get tablet ddl param failed", K(ret)); } else if (merge_param_.start_scn_ > SCN::min_scn() && merge_param_.start_scn_ < ddl_param.start_scn_) { + ret = OB_TASK_EXPIRED; LOG_INFO("ddl merge task expired, do nothing", K(merge_param_), "new_start_scn", ddl_param.start_scn_); } else if (merge_param_.is_commit_ && OB_FAIL(ObTabletDDLUtil::check_data_integrity(ddl_sstable_handles, ddl_param.start_scn_, -- GitLab