From a8e878a7bcefda76f697c9f0d1b79ba235e44e64 Mon Sep 17 00:00:00 2001 From: Charles0429 Date: Thu, 15 Dec 2022 13:15:26 +0000 Subject: [PATCH] add unique index checking retry --- src/rootserver/ddl_task/ob_ddl_single_replica_executor.cpp | 2 +- src/rootserver/ddl_task/ob_ddl_task.cpp | 2 +- src/share/ob_ddl_task_executor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rootserver/ddl_task/ob_ddl_single_replica_executor.cpp b/src/rootserver/ddl_task/ob_ddl_single_replica_executor.cpp index 67f65e3c0..0db3f9803 100644 --- a/src/rootserver/ddl_task/ob_ddl_single_replica_executor.cpp +++ b/src/rootserver/ddl_task/ob_ddl_single_replica_executor.cpp @@ -221,7 +221,7 @@ int ObDDLSingleReplicaExecutor::set_partition_task_status(const common::ObTablet if (OB_SUCCESS == ret_code) { build_infos.at(i).ret_code_ = OB_SUCCESS; build_infos.at(i).stat_ = ObPartitionBuildStat::BUILD_SUCCEED; - } else if (ObIDDLTask::in_ddl_retry_white_list(ret_code) || OB_REPLICA_NOT_READABLE == ret_code || OB_ERR_INSUFFICIENT_PX_WORKER == ret_code) { + } else if (ObIDDLTask::in_ddl_retry_white_list(ret_code)) { build_infos.at(i).ret_code_ = OB_SUCCESS; build_infos.at(i).stat_ = ObPartitionBuildStat::BUILD_RETRY; } else { diff --git a/src/rootserver/ddl_task/ob_ddl_task.cpp b/src/rootserver/ddl_task/ob_ddl_task.cpp index 91049e321..ab888f197 100644 --- a/src/rootserver/ddl_task/ob_ddl_task.cpp +++ b/src/rootserver/ddl_task/ob_ddl_task.cpp @@ -1325,7 +1325,7 @@ int ObDDLWaitColumnChecksumCtx::update_status(const common::ObTabletID &tablet_i found = true; if (OB_SUCCESS == ret_code) { item.col_checksum_stat_ = ColChecksumStat::CCS_SUCCEED; - } else if (OB_NOT_MASTER == ret_code || OB_PARTITION_NOT_EXIST == ret_code) { + } else if (ObIDDLTask::in_ddl_retry_white_list(ret_code)) { item.col_checksum_stat_ = CCS_NOT_MASTER; } else { item.col_checksum_stat_ = CCS_FAILED; diff --git a/src/share/ob_ddl_task_executor.h b/src/share/ob_ddl_task_executor.h index 754b1a52a..2f6997766 100644 --- a/src/share/ob_ddl_task_executor.h +++ b/src/share/ob_ddl_task_executor.h @@ -79,7 +79,7 @@ private: || common::OB_ERR_REMOTE_SCHEMA_NOT_FULL == ret_code || common::OB_ERR_EXCLUSIVE_LOCK_CONFLICT == ret_code || common::OB_ERR_EXCLUSIVE_LOCK_CONFLICT == ret_code || common::OB_ERR_EXCLUSIVE_LOCK_CONFLICT_NOWAIT == ret_code || common::OB_TRANS_STMT_NEED_RETRY == ret_code || common::OB_SCHEMA_NOT_UPTODATE == ret_code || common::OB_TRANSACTION_SET_VIOLATION == ret_code || common::OB_TRANS_CANNOT_SERIALIZE == ret_code || common::OB_GTI_NOT_READY == ret_code - || common::OB_TRANS_WEAK_READ_VERSION_NOT_READY == ret_code || common::OB_REPLICA_NOT_READABLE == ret_code; + || common::OB_TRANS_WEAK_READ_VERSION_NOT_READY == ret_code || common::OB_REPLICA_NOT_READABLE == ret_code || common::OB_ERR_INSUFFICIENT_PX_WORKER == ret_code; } static bool is_not_exist(const int ret_code) { return common::OB_LS_NOT_EXIST == ret_code || common::OB_TABLET_NOT_EXIST == ret_code || common::OB_TENANT_NOT_EXIST == ret_code