New upstream version 6.0.20upstream

1 files changed, 10 insertions, 8 deletions

diff --git a/src/mongo/db/storage/kv/storage_engine_test.cpp b/src/mongo/db/storage/kv/storage_engine_test.cpp
index fe85863c7b5..0a7fb957003 100644
--- a/src/mongo/db/storage/kv/storage_engine_test.cpp
+++ b/src/mongo/db/storage/kv/storage_engine_test.cpp
@@ -649,15 +649,17 @@ TEST_F(TimestampKVEngineTest, TimestampMonitorNotifiesListeners) {
     _storageEngine->getTimestampMonitor()->addListener(&fourth);
 
     // Wait until all 4 listeners get notified at least once.
-    stdx::unique_lock<Latch> lk(mutex);
-    cv.wait(lk, [&] {
-        for (auto const& change : changes) {
-            if (!change) {
-                return false;
+    {
+        stdx::unique_lock<Latch> lk(mutex);
+        cv.wait(lk, [&] {
+            for (auto const& change : changes) {
+                if (!change) {
+                    return false;
+                }
             }
-        }
-        return true;
-    });
+            return true;
+        });
+    };
 
     _storageEngine->getTimestampMonitor()->clearListeners();
 }