From 27ed83ca30107c8e39417ba1dfed5ec0dd8b859d Mon Sep 17 00:00:00 2001
From: Ben Caimano <ben.caimano@mongodb.com>
Date: Thu, 17 Oct 2019 00:51:52 +0000
Subject: SERVER-43987 Require predicates with
 OperationContext::waitForConditionOrInterrupt()

---
 src/mongo/db/commands/validate.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mongo/db/commands/validate.cpp')

diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp
index 35369e9ef7c..09594aa207e 100644
--- a/src/mongo/db/commands/validate.cpp
+++ b/src/mongo/db/commands/validate.cpp
@@ -150,9 +150,9 @@ public:
         {
             stdx::unique_lock<Latch> lock(_validationMutex);
             try {
-                while (_validationsInProgress.find(nss.ns()) != _validationsInProgress.end()) {
-                    opCtx->waitForConditionOrInterrupt(_validationNotifier, lock);
-                }
+                opCtx->waitForConditionOrInterrupt(_validationNotifier, lock, [&] {
+                    return _validationsInProgress.find(nss.ns()) == _validationsInProgress.end();
+                });
             } catch (AssertionException& e) {
                 CommandHelpers::appendCommandStatusNoThrow(
                     result,
-- 
cgit v1.2.1