SERVER-63989 Release the snapshot before pausing in the hangBeforeWaitingForWriteConcern fail point

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp
index 91a8cddac86..94d5350dfc1 100644
--- a/src/mongo/db/write_concern.cpp
+++ b/src/mongo/db/write_concern.cpp
@@ -275,8 +275,15 @@ Status waitForWriteConcern(OperationContext* opCtx,
     auto* const storageEngine = opCtx->getServiceContext()->getStorageEngine();
     auto const replCoord = repl::ReplicationCoordinator::get(opCtx);
 
-    if (!opCtx->getClient()->isInDirectClient()) {
+    if (MONGO_unlikely(hangBeforeWaitingForWriteConcern.shouldFail()) &&
+        !opCtx->getClient()->isInDirectClient()) {
         // Respecting this failpoint for internal clients prevents stepup from working properly.
+        // This fail point pauses with an open snapshot on the oplog. Some tests pause on this fail
+        // point prior to running replication rollback. This prevents the operation from being
+        // killed and the snapshot being released. Hence, we release the snapshot here.
+        auto recoveryUnit = opCtx->releaseAndReplaceRecoveryUnit();
+        recoveryUnit.reset();
+
         hangBeforeWaitingForWriteConcern.pauseWhileSet();
     }