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

[opt] optimize the lock in the reconfiguration interfaces

Browse Source
This commit is contained in:
BinChenn
2024-01-09 03:52:30 +00:00
committed by ob-robot
parent f6ab880d07
commit 74642cad5d
2 changed files with 18 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/logservice/ob_log_handler.cpp
View File

@ -609,13 +609,9 @@ int ObLogHandler::change_replica_num(const common::ObMemberList &member_list,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(member_list), K(curr_replica_num),
K(new_replica_num), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!member_list.is_valid() || } else if (!member_list.is_valid() ||
@ -681,13 +677,9 @@ int ObLogHandler::add_member(const common::ObMember &added_member,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(added_member), K(new_replica_num),
K(config_version), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!added_member.is_valid() || } else if (!added_member.is_valid() ||
@ -721,13 +713,9 @@ int ObLogHandler::remove_member(const common::ObMember &removed_member,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(removed_member),
K(new_replica_num), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!removed_member.is_valid() || } else if (!removed_member.is_valid() ||
@ -760,13 +748,9 @@ int ObLogHandler::replace_member(const common::ObMember &added_member,
const palf::LogConfigVersion &config_version, const palf::LogConfigVersion &config_version,
const int64_t timeout_us) { const int64_t timeout_us) {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(added_member), K(removed_member),
K(config_version), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!added_member.is_valid() || } else if (!added_member.is_valid() ||
@ -793,13 +777,9 @@ int ObLogHandler::replace_member_with_learner(const common::ObMember &added_memb
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(added_member), K(removed_member),
K(config_version), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!added_member.is_valid() || } else if (!added_member.is_valid() ||
@ -833,12 +813,9 @@ int ObLogHandler::add_learner(const common::ObMember &added_learner,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(added_learner), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!added_learner.is_valid() || } else if (!added_learner.is_valid() ||
@ -867,12 +844,9 @@ int ObLogHandler::remove_learner(const common::ObMember &removed_learner,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(removed_learner), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!removed_learner.is_valid() || } else if (!removed_learner.is_valid() ||
@ -897,13 +871,9 @@ int ObLogHandler::replace_learners(const common::ObMemberList &added_learners,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(added_learners),
K(removed_learners), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!added_learners.is_valid() || } else if (!added_learners.is_valid() ||
@ -934,13 +904,9 @@ int ObLogHandler::switch_learner_to_acceptor(const common::ObMember &learner,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(learner), K(new_replica_num),
K(config_version), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!learner.is_valid() || } else if (!learner.is_valid() ||
@ -972,13 +938,9 @@ int ObLogHandler::switch_acceptor_to_learner(const common::ObMember &member,
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(member),
K(new_replica_num), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!member.is_valid() || } else if (!member.is_valid() ||
@ -1062,12 +1024,9 @@ int ObLogHandler::add_arbitration_member(const common::ObMember &added_member,
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t begin_ts = ObTimeUtility::current_time(); const int64_t begin_ts = ObTimeUtility::current_time();
int64_t current_timeout_us = timeout_us; int64_t current_timeout_us = timeout_us;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(added_member), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!added_member.is_valid() || timeout_us <= 0) { } else if (!added_member.is_valid() || timeout_us <= 0) {
@ -1105,12 +1064,9 @@ int ObLogHandler::remove_arbitration_member(const common::ObMember &removed_memb
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int64_t current_timeout_us = timeout_us; int64_t current_timeout_us = timeout_us;
const int64_t begin_ts = ObTimeUtility::current_time(); const int64_t begin_ts = ObTimeUtility::current_time();
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(removed_member), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (!removed_member.is_valid() || timeout_us <= 0) { } else if (!removed_member.is_valid() || timeout_us <= 0) {
@ -1142,12 +1098,9 @@ int ObLogHandler::degrade_acceptor_to_learner(const palf::LogMemberAckInfoList &
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(degrade_servers), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (0 == degrade_servers.count() || } else if (0 == degrade_servers.count() ||
@ -1170,12 +1123,9 @@ int ObLogHandler::upgrade_learner_to_acceptor(const palf::LogMemberAckInfoList &
const int64_t timeout_us) const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(upgrade_servers), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (0 == upgrade_servers.count() || } else if (0 == upgrade_servers.count() ||
@ -1195,12 +1145,9 @@ int ObLogHandler::try_lock_config_change(const int64_t lock_owner, const int64_t
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(lock_owner), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (palf::OB_INVALID_CONFIG_CHANGE_LOCK_OWNER == lock_owner || timeout_us <= 0) { } else if (palf::OB_INVALID_CONFIG_CHANGE_LOCK_OWNER == lock_owner || timeout_us <= 0) {
@ -1220,14 +1167,11 @@ int ObLogHandler::try_lock_config_change(const int64_t lock_owner, const int64_t
int ObLogHandler::unlock_config_change(const int64_t lock_owner, const int64_t timeout_us) int ObLogHandler::unlock_config_change(const int64_t lock_owner, const int64_t timeout_us)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + timeout_us / 2;
// Note: rlock is safe, the deps_lock_ is used to protect states of ObLogHandler // Note: rlock is safe, the deps_lock_ is used to protect states of ObLogHandler
// such as is_in_stop_state_. // such as is_in_stop_state_.
RLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret); RLockGuard deps_guard(deps_lock_);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(lock_owner), K(timeout_us));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else if (palf::OB_INVALID_CONFIG_CHANGE_LOCK_OWNER == lock_owner || timeout_us <= 0) { } else if (palf::OB_INVALID_CONFIG_CHANGE_LOCK_OWNER == lock_owner || timeout_us <= 0) {
@ -1248,12 +1192,9 @@ int ObLogHandler::get_config_change_lock_stat(int64_t &lock_owner, bool &is_lock
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t CONFIG_CHANGE_TIMEOUT = 10 * 1000 * 1000L; // 10s const int64_t CONFIG_CHANGE_TIMEOUT = 10 * 1000 * 1000L; // 10s
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + CONFIG_CHANGE_TIMEOUT; RLockGuard deps_guard(deps_lock_);
WLockGuardWithTimeout deps_guard(deps_lock_, abs_timeout_us, ret);
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
} else if (OB_FAIL(ret)) {
CLOG_LOG(WARN, "get_lock failed", KR(ret), K_(id), K(lock_owner), K(is_locked));
} else if (is_in_stop_state_) { } else if (is_in_stop_state_) {
ret = OB_NOT_RUNNING; ret = OB_NOT_RUNNING;
} else { } else {

1
src/logservice/ob_log_handler.h
View File

@ -709,6 +709,7 @@ public:
private: private:
static constexpr int64_t MIN_CONN_TIMEOUT_US = 5 * 1000 * 1000; // 5s static constexpr int64_t MIN_CONN_TIMEOUT_US = 5 * 1000 * 1000; // 5s
typedef common::TCRWLock::RLockGuardWithTimeout RLockGuardWithTimeout; typedef common::TCRWLock::RLockGuardWithTimeout RLockGuardWithTimeout;
typedef common::TCRWLock::RLockGuard RLockGuard;
typedef common::TCRWLock::WLockGuardWithTimeout WLockGuardWithTimeout; typedef common::TCRWLock::WLockGuardWithTimeout WLockGuardWithTimeout;
private: private:
int submit_config_change_cmd_(const LogConfigChangeCmd &req); int submit_config_change_cmd_(const LogConfigChangeCmd &req);