rgw: dmclock: wait until the request is handled.

Fixes: https://tracker.ceph.com/issues/42217
Signed-off-by: GaryHyg <huygbj@inspur.com>
(cherry picked from commit ec507626624a66a3a81d7ea65d0b8d78d9b8a221)

diff --git a/src/rgw/rgw_dmclock_sync_scheduler.cc b/src/rgw/rgw_dmclock_sync_scheduler.cc
index f1950f55cfb064c9a0433807fc4bca128852e34e..650a995d229452dd38db06b2115d11f3b62edcf8 100644 (file)
--- a/src/rgw/rgw_dmclock_sync_scheduler.cc
+++ b/src/rgw/rgw_dmclock_sync_scheduler.cc
@@ -24,8 +24,9 @@ int SyncScheduler::add_request(const client_id& client, const ReqParams& params,
     }
     queue.request_completed();
     // Perform a blocking wait until the request callback is called
-    if (std::unique_lock<std::mutex> lk(req_mtx); rstate != ReqState::Wait) {
-      req_cv.wait(lk, [&rstate] {return rstate != ReqState::Wait;});
+    {
+      std::unique_lock lock{req_mtx};
+      req_cv.wait(lock, [&rstate] {return rstate != ReqState::Wait;});
     }
     if (rstate == ReqState::Cancelled) {
       //FIXME: decide on error code for cancelled request