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

add transfer member list event in normal mode

Browse Source
This commit is contained in:
oceanoverflow
2023-08-03 06:42:20 +00:00
committed by ob-robot
parent 0c950950e8
commit a240652d45
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/storage/high_availability/ob_transfer_lock_utils.cpp
View File

@ -270,25 +270,25 @@ int ObMemberListLockUtils::try_lock_config_change_(
storage::ObStorageRpc storage_rpc; storage::ObStorageRpc storage_rpc;
if (OB_FAIL(init_storage_rpc_(storage_svr_rpc_proxy, storage_rpc))) { if (OB_FAIL(init_storage_rpc_(storage_svr_rpc_proxy, storage_rpc))) {
LOG_WARN("failed to init storage rpc", K(ret)); LOG_WARN("failed to init storage rpc", K(ret));
} else if (OB_FAIL(try_lock_config_change_fallback_(lock_info, lock_timeout, storage_rpc))) { } else if (OB_FAIL(inner_try_lock_config_change_(lock_info, lock_timeout, storage_rpc))) {
LOG_WARN("failed to try lock config change fallback", K(ret), K(lock_info)); LOG_WARN("failed to try lock config change fallback", K(ret), K(lock_info));
} else { } else {
LOG_INFO("try lock config change fallback", K(lock_info), K(lock_timeout)); LOG_INFO("try lock config change fallback", K(lock_info), K(lock_timeout));
} }
destory_storage_rpc_(storage_svr_rpc_proxy, storage_rpc); destory_storage_rpc_(storage_svr_rpc_proxy, storage_rpc);
#ifdef ERRSIM if (OB_SUCC(ret)) {
SERVER_EVENT_ADD("TRANSFER_LOCK", "LOCK_CONFIG_CHANGE", SERVER_EVENT_ADD("TRANSFER_LOCK", "LOCK_CONFIG_CHANGE",
"tenant_id", lock_info.tenant_id_, "tenant_id", lock_info.tenant_id_,
"ls_id", lock_info.ls_id_.id(), "ls_id", lock_info.ls_id_.id(),
"task_id", lock_info.task_id_, "task_id", lock_info.task_id_,
"status", lock_info.status_.str(), "status", lock_info.status_.str(),
"lock_owner", lock_info.lock_owner_, "lock_owner", lock_info.lock_owner_,
"lock_member_list", lock_info.comment_); "lock_member_list", lock_info.comment_);
#endif }
return ret; return ret;
} }
int ObMemberListLockUtils::try_lock_config_change_fallback_( int ObMemberListLockUtils::inner_try_lock_config_change_(
const ObTransferTaskLockInfo &lock_info, const int64_t lock_timeout, const ObTransferTaskLockInfo &lock_info, const int64_t lock_timeout,
storage::ObStorageRpc &storage_rpc) storage::ObStorageRpc &storage_rpc)
{ {
@ -377,15 +377,15 @@ int ObMemberListLockUtils::unlock_config_change_(
LOG_INFO("unlock lock config change fallback", K(lock_info), K(lock_timeout)); LOG_INFO("unlock lock config change fallback", K(lock_info), K(lock_timeout));
} }
destory_storage_rpc_(storage_svr_rpc_proxy, storage_rpc); destory_storage_rpc_(storage_svr_rpc_proxy, storage_rpc);
#ifdef ERRSIM if (OB_SUCC(ret)) {
SERVER_EVENT_ADD("TRANSFER_LOCK", "UNLOCK_CONFIG_CHANGE", SERVER_EVENT_ADD("TRANSFER_LOCK", "UNLOCK_CONFIG_CHANGE",
"tenant_id", lock_info.tenant_id_, "tenant_id", lock_info.tenant_id_,
"ls_id", lock_info.ls_id_.id(), "ls_id", lock_info.ls_id_.id(),
"task_id", lock_info.task_id_, "task_id", lock_info.task_id_,
"status", lock_info.status_.str(), "status", lock_info.status_.str(),
"lock_owner", lock_info.lock_owner_, "lock_owner", lock_info.lock_owner_,
"unlock_member_list", lock_info.comment_); "unlock_member_list", lock_info.comment_);
#endif }
return ret; return ret;
} }
@ -596,15 +596,15 @@ int ObMemberListLockUtils::relock_before_unlock_(const ObTransferTaskLockInfo &l
} else { } else {
LOG_WARN("relock before unlock", K(ret), K(lock_info)); LOG_WARN("relock before unlock", K(ret), K(lock_info));
} }
#ifdef ERRSIM if (OB_SUCC(ret)) {
SERVER_EVENT_ADD("TRANSFER_LOCK", "RELOCK_BEFORE_UNLOCK", SERVER_EVENT_ADD("TRANSFER_LOCK", "RELOCK_BEFORE_UNLOCK",
"tenant_id", lock_info.tenant_id_, "tenant_id", lock_info.tenant_id_,
"ls_id", lock_info.ls_id_, "ls_id", lock_info.ls_id_,
"status", lock_info.status_, "status", lock_info.status_,
"inner_table_lock_owner", lock_info.lock_owner_, "inner_table_lock_owner", lock_info.lock_owner_,
"palf_lock_owner", palf_lock_owner, "palf_lock_owner", palf_lock_owner,
"result", ret); "result", ret);
#endif }
return ret; return ret;
} }

2
src/storage/high_availability/ob_transfer_lock_utils.h
View File

@ -54,7 +54,7 @@ private:
private: private:
/* palf lock config*/ /* palf lock config*/
static int try_lock_config_change_(const ObTransferTaskLockInfo &lock_info, const int64_t lock_timeout); static int try_lock_config_change_(const ObTransferTaskLockInfo &lock_info, const int64_t lock_timeout);
static int try_lock_config_change_fallback_(const ObTransferTaskLockInfo &lock_info, const int64_t lock_timeout, static int inner_try_lock_config_change_(const ObTransferTaskLockInfo &lock_info, const int64_t lock_timeout,
storage::ObStorageRpc &storage_rpc); storage::ObStorageRpc &storage_rpc);
static int get_config_change_lock_stat_(const ObTransferTaskLockInfo &lock_info, static int get_config_change_lock_stat_(const ObTransferTaskLockInfo &lock_info,
int64_t &palf_lock_owner, bool &is_locked); int64_t &palf_lock_owner, bool &is_locked);