Merge pull request #18522 from ClickHouse/fix_concurrent_bounded_queue_timeout

Fix usage of concurrent bounded queue in test keeper storage

src/Common/ZooKeeper/TestKeeperStorage.cpp

@@ -740,11 +740,13 @@ void TestKeeperStorage::putRequest(const Coordination::ZooKeeperRequestPtr & req
     request_info.session_id = session_id;
     request_info.response_callback = callback;
 
-    /// Put close requests without timeouts
-    auto timeout = request->getOpNum() == Coordination::OpNum::Close ? 0 : operation_timeout.totalMilliseconds();
     std::lock_guard lock(push_request_mutex);
-    if (!requests_queue.tryPush(std::move(request_info), timeout))
+    /// Put close requests without timeouts
+    if (request->getOpNum() == Coordination::OpNum::Close)
+        requests_queue.push(std::move(request_info));
+    else if (!requests_queue.tryPush(std::move(request_info), operation_timeout.totalMilliseconds()))
         throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
+
 }
 
 void TestKeeperStorage::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id, ResponseCallback callback, ResponseCallback watch_callback)
@@ -758,10 +760,11 @@ void TestKeeperStorage::putRequest(const Coordination::ZooKeeperRequestPtr & req
     if (request->has_watch)
         request_info.watch_callback = watch_callback;
 
-    /// Put close requests without timeouts
-    auto timeout = request->getOpNum() == Coordination::OpNum::Close ? 0 : operation_timeout.totalMilliseconds();
     std::lock_guard lock(push_request_mutex);
-    if (!requests_queue.tryPush(std::move(request_info), timeout))
+    /// Put close requests without timeouts
+    if (request->getOpNum() == Coordination::OpNum::Close)
+        requests_queue.push(std::move(request_info));
+    else if (!requests_queue.tryPush(std::move(request_info), operation_timeout.totalMilliseconds()))
         throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
 }