reset return code to TIMEOUT, to prevent the error code which not user unfriendly

2023-06-16 04:42:23 +00:00
parent 5008e20ff1
commit 3340486d7a
1 changed files with 5 additions and 0 deletions
--- a/src/share/ob_primary_standby_service.cpp
+++ b/src/share/ob_primary_standby_service.cpp
@ -138,6 +138,11 @@ int ObPrimaryStandbyService::switch_tenant(const obrpc::ObSwitchTenantArg &arg)
    LOG_USER_ERROR(OB_OP_NOT_ALLOW, "tenant status is not normal, switch tenant is");
  }

+  // reset return code to TIMEOUT, to prevent the error code which not user unfriendly
+  if (THIS_WORKER.is_timeout() && OB_ERR_EXCLUSIVE_LOCK_CONFLICT == ret) {
+    ret = OB_TIMEOUT;
+  }
+
  int64_t cost = ObTimeUtility::current_time() - begin_time;
  CLUSTER_EVENT_ADD_CONTROL_FINISH(ret, alter_cluster_event,
      K(cost),