cherrypick to 3.1_opensource_release

2021-08-11 15:33:27 +08:00
parent a6d5591ddf
commit 4a58022b57
18 changed files with 249 additions and 46 deletions
--- a/src/clog/ob_log_state_mgr.cpp
+++ b/src/clog/ob_log_state_mgr.cpp
@ -1678,8 +1678,6 @@ int ObLogStateMgr::reconfirm_to_taking_over_()
    revoke_leader_(revoke_type);
  } else if (OB_FAIL(on_leader_takeover_())) {
    CLOG_LOG(WARN, "on_leader_takeover_ failed, try again", K_(partition_key), K(ret));
-  } else if (OB_FAIL(sw_->leader_takeover())) {
-    CLOG_LOG(ERROR, "sw leader_active failed", K(ret), K(partition_key_));
  } else {
    reconfirm_->reset();
    // role_ = LEADER;