From ca421cf83822bbad5d9937a8add42aa729733986 Mon Sep 17 00:00:00 2001 From: zbf0 Date: Thu, 26 Aug 2021 21:13:23 +0800 Subject: [PATCH] standby_cluster - MA - create tenant failed, all ddl operation cannot execute --- src/share/ob_leader_election_waiter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/share/ob_leader_election_waiter.cpp b/src/share/ob_leader_election_waiter.cpp index bb213b121..726b2bdd5 100644 --- a/src/share/ob_leader_election_waiter.cpp +++ b/src/share/ob_leader_election_waiter.cpp @@ -37,13 +37,12 @@ int ObLeaderElectionWaiter::wait(const uint64_t table_id, const int64_t partitio { int ret = OB_SUCCESS; const int64_t start_time = ObTimeUtility::current_time(); - const int64_t abs_timeout = start_time + timeout; ObAddr leader; if (!ObIPartitionTable::is_valid_key(table_id, partition_id) || timeout <= 0) { ret = OB_INVALID_ARGUMENT; LOG_WARN("invalid argument", K(ret), KT(table_id), K(partition_id), K(timeout)); - } else if (OB_FAIL(wait(table_id, partition_id, abs_timeout, leader))) { - LOG_WARN("wait failed", KT(table_id), K(partition_id), K(abs_timeout), K(ret)); + } else if (OB_FAIL(wait(table_id, partition_id, timeout, leader))) { + LOG_WARN("wait failed", KT(table_id), K(partition_id), K(timeout), K(ret)); } LOG_WAIT_RESULT(start_time, KT(table_id), K(partition_id), K(timeout)); return ret;