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

fix OB_TASK_EXPIRED being reset to SUCC.

Browse Source
This commit is contained in:
obdev
2022-11-18 07:35:37 +00:00
committed by wangzelin.wzl
parent c5cff66ebe
commit bdee1b3e70
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/ddl/ob_complement_data_task.cpp
View File

@ -1182,7 +1182,6 @@ int ObComplementMergeTask::process()
int ObComplementMergeTask::add_build_hidden_table_sstable() int ObComplementMergeTask::add_build_hidden_table_sstable()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int saved_ret = OB_SUCCESS;
ObLSHandle ls_handle; ObLSHandle ls_handle;
ObTablet *tablet = nullptr; ObTablet *tablet = nullptr;
ObTabletHandle tablet_handle; ObTabletHandle tablet_handle;
@ -1233,11 +1232,9 @@ int ObComplementMergeTask::add_build_hidden_table_sstable()
prepare_log_ts, prepare_log_ts,
param_->hidden_table_schema_->get_table_id(), param_->hidden_table_schema_->get_table_id(),
param_->task_id_))) { param_->task_id_))) {
saved_ret = ret;
LOG_WARN("commit ddl log failed", K(ret), K(ls_id), K(tablet_id), K(prepare_log_ts), K(hidden_table_key), LOG_WARN("commit ddl log failed", K(ret), K(ls_id), K(tablet_id), K(prepare_log_ts), K(hidden_table_key),
K(ddl_start_log_ts), "new_ddl_start_log_ts", ddl_kv_mgr_handle.get_obj()->get_start_log_ts()); K(ddl_start_log_ts), "new_ddl_start_log_ts", ddl_kv_mgr_handle.get_obj()->get_start_log_ts());
} else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->wait_ddl_commit(ddl_start_log_ts, prepare_log_ts))) { } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->wait_ddl_commit(ddl_start_log_ts, prepare_log_ts))) {
saved_ret = ret;
LOG_WARN("wait ddl commit failed", K(ret), K(ls_id), K(tablet_id), K(hidden_table_key), LOG_WARN("wait ddl commit failed", K(ret), K(ls_id), K(tablet_id), K(hidden_table_key),
K(ddl_start_log_ts), "new_ddl_start_log_ts", ddl_kv_mgr_handle.get_obj()->get_start_log_ts()); K(ddl_start_log_ts), "new_ddl_start_log_ts", ddl_kv_mgr_handle.get_obj()->get_start_log_ts());
} else if (OB_FAIL(context_->data_sstable_redo_writer_.write_commit_log(hidden_table_key, } else if (OB_FAIL(context_->data_sstable_redo_writer_.write_commit_log(hidden_table_key,
@ -1247,9 +1244,6 @@ int ObComplementMergeTask::add_build_hidden_table_sstable()
tablet_handle.get_obj()->remove_ddl_kv_mgr(); tablet_handle.get_obj()->remove_ddl_kv_mgr();
} }
} }
if (OB_FAIL(ret)) {
ret = OB_TASK_EXPIRED == saved_ret ? OB_SUCCESS : ret;
}
return ret; return ret;
} }