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

fix error code lost.

Browse Source
This commit is contained in:
obdev
2023-09-08 13:54:05 +08:00
committed by ob-robot
parent baf03b8664
commit fa3b4469e1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rootserver/ddl_task/ob_table_redefinition_task.cpp
View File

@ -835,7 +835,7 @@ int ObTableRedefinitionTask::take_effect(const ObDDLTaskStatus next_task_status)
} else { } else {
LOG_WARN("sync auto increment position failed", K(ret), K(object_id_), K(target_object_id_)); LOG_WARN("sync auto increment position failed", K(ret), K(object_id_), K(target_object_id_));
} }
} else if (OB_FAIL(need_sync_stats && sync_stats_info())) { } else if (need_sync_stats && OB_FAIL(sync_stats_info())) {
LOG_WARN("fail to sync stats info", K(ret), K(object_id_), K(target_object_id_)); LOG_WARN("fail to sync stats info", K(ret), K(object_id_), K(target_object_id_));
} else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(dst_tenant_id_, target_object_id_, ddl_rpc_timeout))) { } else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(dst_tenant_id_, target_object_id_, ddl_rpc_timeout))) {
LOG_WARN("get ddl rpc timeout fail", K(ret)); LOG_WARN("get ddl rpc timeout fail", K(ret));

3
src/share/ob_ddl_task_executor.h
View File

@ -94,7 +94,8 @@ private:
} }
static bool is_stop_state(const int ret_code) { static bool is_stop_state(const int ret_code) {
return common::OB_IN_STOP_STATE == ret_code || common::OB_SERVER_IS_INIT == ret_code || common::OB_SERVER_IS_STOPPING == ret_code return common::OB_IN_STOP_STATE == ret_code || common::OB_SERVER_IS_INIT == ret_code || common::OB_SERVER_IS_STOPPING == ret_code
|| common::OB_RS_SHUTDOWN == ret_code || common::OB_PARTITION_IS_STOPPED == ret_code; || common::OB_RS_SHUTDOWN == ret_code || common::OB_PARTITION_IS_STOPPED == ret_code
|| common::OB_PARTITION_IS_BLOCKED == ret_code;
} }
static bool is_not_master(const int ret_code) { static bool is_not_master(const int ret_code) {
return common::OB_STATE_NOT_MATCH == ret_code || common::OB_NOT_MASTER == ret_code || OB_RS_NOT_MASTER == ret_code return common::OB_STATE_NOT_MATCH == ret_code || common::OB_NOT_MASTER == ret_code || OB_RS_NOT_MASTER == ret_code