From 11a8b4aee65db42befd6383f05006ae4c01deca2 Mon Sep 17 00:00:00 2001 From: hezuojiao Date: Tue, 17 Dec 2024 13:45:03 +0000 Subject: [PATCH] [CP] Fix the locks timeout args for auto-increment broadcast --- src/share/ob_global_autoinc_service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/share/ob_global_autoinc_service.cpp b/src/share/ob_global_autoinc_service.cpp index b39364c1c..27abbb04f 100644 --- a/src/share/ob_global_autoinc_service.cpp +++ b/src/share/ob_global_autoinc_service.cpp @@ -688,9 +688,10 @@ int ObGlobalAutoIncService::deserialize_autoinc_cache(DESERIAL_PARAMS) int ObGlobalAutoIncService::wait_all_requests_to_finish() { int ret = OB_SUCCESS; + const int64_t abs_timeout_us = ObTimeUtility::current_time() + BROADCAST_OP_TIMEOUT; for (int64_t i = 0; OB_SUCC(ret) && i < MUTEX_NUM; i++) { // wait for all working threads to finish - if (OB_FAIL(op_mutex_[i].lock(BROADCAST_OP_TIMEOUT))) { + if (OB_FAIL(op_mutex_[i].lock(abs_timeout_us))) { LOG_WARN("fail to lock mutex", K(ret), K(i)); } else { op_mutex_[i].unlock();