SERVER-48171 FailPoint wait functions accept Interruptible

1 files changed, 9 insertions, 10 deletions

diff --git a/src/mongo/util/fail_point.h b/src/mongo/util/fail_point.h
index c7a5f547b35..7467ce4d67a 100644
--- a/src/mongo/util/fail_point.h
+++ b/src/mongo/util/fail_point.h
@@ -35,11 +35,11 @@
 #include "mongo/base/status.h"
 #include "mongo/base/status_with.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/db/operation_context.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/platform/mutex.h"
 #include "mongo/stdx/unordered_map.h"
 #include "mongo/util/duration.h"
+#include "mongo/util/interruptible.h"
 
 namespace mongo {
 
@@ -272,11 +272,11 @@ public:
     EntryCountT waitForTimesEntered(EntryCountT targetTimesEntered) const noexcept;
 
     /**
-     * Like `waitForTimesEntered`, but interruptible via the `opCtx->sleepFor` mechanism.  See
-     * `mongo::Interruptible::sleepFor` (Interruptible is a base class of
-     * OperationContext).
+     * Like `waitForTimesEntered`, but interruptible via the `interruptible->sleepFor` mechanism.
+     * See `mongo::Interruptible::sleepFor`.
      */
-    EntryCountT waitForTimesEntered(OperationContext* opCtx, EntryCountT targetTimesEntered) const;
+    EntryCountT waitForTimesEntered(Interruptible* interruptible,
+                                    EntryCountT targetTimesEntered) const;
 
     /**
      * @returns a BSON object showing the current mode and data stored.
@@ -338,14 +338,13 @@ public:
     }
 
     /**
-     * Like `pauseWhileSet`, but interruptible via the `opCtx->sleepFor` mechanism.  See
-     * `mongo::Interruptible::sleepFor` (Interruptible is a base class of
-     * OperationContext).
+     * Like `pauseWhileSet`, but interruptible via the `interruptible->sleepFor` mechanism.  See
+     * `mongo::Interruptible::sleepFor`.
      */
-    void pauseWhileSet(OperationContext* opCtx) {
+    void pauseWhileSet(Interruptible* interruptible) {
         for (auto entryMode = kFirstTimeEntered; MONGO_unlikely(shouldFail(entryMode));
              entryMode = kEnteredAlready) {
-            opCtx->sleepFor(Milliseconds(100));
+            interruptible->sleepFor(Milliseconds(100));
         }
     }