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

[4.2][Switchover/Failover]Optimize error code and error message

Browse Source
This commit is contained in:
obdev
2023-08-29 09:44:22 +00:00
committed by ob-robot
parent 220556e5be
commit 7678a4a676
4 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/logservice/ob_log_flashback_service.cpp
View File

@ -181,7 +181,7 @@ int ObLogFlashbackService::wait_all_ls_replicas_log_sync_(
CLOG_LOG(WARN, "push_back failed", K(ret), K_(self), K(op));
}
}
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "logs of some replicas may be not sync, check these replicas");
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "logs of some replicas may be not sync, role transition");
CLOG_LOG(WARN, "logs of some replicas may be not sync, check these replicas", K(ret),
K_(self), K(failed_ls_ops));
}
@ -274,8 +274,8 @@ int ObLogFlashbackService::do_flashback_(
CLOG_LOG(WARN, "push_back failed", K(ret), K_(self), K(op));
}
}
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "logs of some replicas may have not been flashbacked, check these replicas");
CLOG_LOG(WARN, "logs of some replicas may have not been flashbacked, check these replicas",
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "logs of some replicas may have not finished flashback, role transition");
CLOG_LOG(WARN, "logs of some replicas may have not finished flashback, check these replicas",
K(ret), K_(self), K(failed_ls_ops));
}
}

55
src/rootserver/ob_tenant_role_transition_service.cpp
View File

@ -29,6 +29,9 @@
#include "storage/tx/ob_timestamp_service.h" // ObTimestampService
#include "share/ob_primary_standby_service.h" // ObPrimaryStandbyService
#include "share/balance/ob_balance_task_helper_operator.h"//ObBalanceTaskHelper
#include "lib/utility/ob_macro_utils.h"
#include "lib/ob_errno.h"
#include "share/oracle_errno.h"//oracle error code
namespace oceanbase
{
@ -37,6 +40,48 @@ using namespace palf;
namespace rootserver
{
#define TENANT_ROLE_TRANS_USER_ERROR \
int tmp_ret = OB_SUCCESS; \
ObSqlString str; \
switch (ret) { \
case -ER_TABLEACCESS_DENIED_ERROR: \
case OB_ERR_NO_TABLE_PRIVILEGE: \
case -OER_TABLE_OR_VIEW_NOT_EXIST: \
case -ER_DBACCESS_DENIED_ERROR: \
case OB_ERR_NO_DB_PRIVILEGE: \
case OB_ERR_NULL_VALUE: \
case OB_ERR_WAIT_REMOTE_SCHEMA_REFRESH: \
case -ER_CONNECT_FAILED: \
case OB_PASSWORD_WRONG: \
case -ER_ACCESS_DENIED_ERROR: \
case OB_ERR_NO_LOGIN_PRIVILEGE: \
case -OER_INTERNAL_ERROR_CODE: \
if (OB_TMP_FAIL(str.assign_fmt("query primary failed(original error code: %d), switch to primary", ret))) { \
LOG_WARN("tenant role trans user error str assign failed"); \
} else { \
ret = OB_OP_NOT_ALLOW; \
LOG_USER_ERROR(OB_OP_NOT_ALLOW, str.ptr()); \
} \
break; \
case OB_ERR_TENANT_IS_LOCKED: \
ret = OB_OP_NOT_ALLOW; \
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "primary tenant is locked, role transition"); \
break; \
case OB_SOURCE_TENANT_STATE_NOT_MATCH: \
LOG_USER_ERROR(OB_SOURCE_TENANT_STATE_NOT_MATCH); \
break; \
case OB_SOURCE_LS_STATE_NOT_MATCH: \
LOG_USER_ERROR(OB_SOURCE_LS_STATE_NOT_MATCH); \
break; \
default: \
if (OB_TMP_FAIL(str.assign_fmt("wait tenant sync to latest failed(original error code: %d), switch to primary", ret))){ \
LOG_WARN("tenant role trans user error str assign failed"); \
} else { \
ret = OB_OP_NOT_ALLOW; \
LOG_USER_ERROR(OB_OP_NOT_ALLOW, str.ptr()); \
} \
} \
const char* const ObTenantRoleTransitionConstants::SWITCH_TO_PRIMARY_LOG_MOD_STR = "SWITCH_TO_PRIMARY";
const char* const ObTenantRoleTransitionConstants::SWITCH_TO_STANDBY_LOG_MOD_STR = "SWITCH_TO_STANDBY";
const char* const ObTenantRoleTransitionConstants::RESTORE_TO_STANDBY_LOG_MOD_STR = "RESTORE_TO_STANDBY";
@ -114,7 +159,8 @@ int ObTenantRoleTransitionService::failover_to_primary()
LOG_INFO("[ROLE_TRANSITION] finish failover to primary", KR(ret), K(tenant_info), K(cost));
return ret;
}
ERRSIM_POINT_DEF(ERRSIM_TENANT_ROLE_TRANS_WAIT_SYNC_ERROR);
int ObTenantRoleTransitionService::do_failover_to_primary_(const share::ObAllTenantInfo &tenant_info)
{
int ret = OB_SUCCESS;
@ -134,6 +180,11 @@ int ObTenantRoleTransitionService::do_failover_to_primary_(const share::ObAllTen
} else if (obrpc::ObSwitchTenantArg::OpType::SWITCH_TO_PRIMARY == switch_optype_
&& OB_FAIL(wait_tenant_sync_to_latest_until_timeout_(tenant_id_, tenant_info))) {
LOG_WARN("fail to wait_tenant_sync_to_latest_until_timeout_", KR(ret), K_(tenant_id), K(tenant_info));
TENANT_ROLE_TRANS_USER_ERROR;
} else if (OB_SUCC(ret) && ERRSIM_TENANT_ROLE_TRANS_WAIT_SYNC_ERROR) {
ret = ERRSIM_TENANT_ROLE_TRANS_WAIT_SYNC_ERROR;
TENANT_ROLE_TRANS_USER_ERROR;
LOG_WARN("errsim wait_tenant_sync_to_latest_until_timeout", K(ret));
} else if (OB_FAIL(ObAllTenantInfoProxy::update_tenant_role(
tenant_id_, sql_proxy_, tenant_info.get_switchover_epoch(),
share::STANDBY_TENANT_ROLE, tenant_info.get_switchover_status(),
@ -378,7 +429,7 @@ int ObTenantRoleTransitionService::do_switch_access_mode_to_append(
ret = OB_OP_NOT_ALLOW;
LOG_WARN("Tenant status changed by concurrent operation, switch to primary not allowed",
KR(ret), K(tenant_info), K(cur_tenant_info));
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "Tenant status changed by concurrent operation, switch to primary");
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "tenant status changed by concurrent operation, switch to primary");
} else if (OB_FAIL(ObAllTenantInfoProxy::update_tenant_role(
tenant_id_, &trans, tenant_info.get_switchover_epoch(),
share::PRIMARY_TENANT_ROLE, tenant_info.get_switchover_status(),

6
src/share/backup/ob_log_restore_config.cpp
View File

@ -233,9 +233,9 @@ int ObLogRestoreSourceServiceConfigParser::check_before_update_inner_config(
} else if (!for_verify && OB_FAIL(service_attr_.check_restore_source_is_self_(source_is_self, tenant_id_))) {
LOG_WARN("check restore source is self failed");
} else if (source_is_self) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("set standby itself as log restore source is not allowed");
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "set standby itself as log restore source");
ret = OB_OP_NOT_ALLOW;
LOG_WARN("set tenant itself as log restore source is not allowed");
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "set tenant itself as log restore source is");
} else if (OB_FAIL(proxy.get_compatibility_mode(service_attr_.user_.tenant_id_, service_attr_.user_.mode_))) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("get primary compatibility mode failed", K(tenant_id_), K(service_attr_.user_.tenant_id_));

4
src/share/ob_log_restore_proxy.cpp
View File

@ -41,6 +41,7 @@ namespace share
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "get primary " args ", privilege is insufficient"); \
break; \
case -ER_ACCESS_DENIED_ERROR: \
case OB_PASSWORD_WRONG: \
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "get primary " args ", please check the user and password"); \
break; \
case -ER_DBACCESS_DENIED_ERROR: \
@ -64,6 +65,9 @@ namespace share
case -ER_CONNECT_FAILED: \
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "get primary " args ", please check the network"); \
break; \
case OB_ERR_TENANT_IS_LOCKED: \
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "get primary " args ", primary tenant is locked"); \
break; \
default: \
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "get primary " args); \
} \