SERVER-40938: disallow afterClusterTime and ignore prepare conflicts for dbhash and map-reduce

1 files changed, 6 insertions, 33 deletions

diff --git a/src/mongo/db/introspect.cpp b/src/mongo/db/introspect.cpp
index a82e67a0e6c..425d100f183 100644
--- a/src/mongo/db/introspect.cpp
+++ b/src/mongo/db/introspect.cpp
@@ -80,39 +80,6 @@ void _appendUserInfo(const CurOp& c, BSONObjBuilder& builder, AuthorizationSessi
     builder.append("user", bestUser.getUser().empty() ? "" : bestUser.getFullName());
 }
 
-/**
- * When in scope, closes any active storage transactions and enforces prepare conflicts for reads.
- *
- * Locks must be held while this is in scope because both constructor and destructor access the
- * storage engine.
- */
-class EnforcePrepareConflictsBlock {
-public:
-    explicit EnforcePrepareConflictsBlock(OperationContext* opCtx)
-        : _opCtx(opCtx), _originalValue(opCtx->recoveryUnit()->getIgnorePrepared()) {
-        dassert(_opCtx->lockState()->isLocked());
-        dassert(!_opCtx->lockState()->inAWriteUnitOfWork());
-
-        // It is illegal to call setIgnorePrepared() while any storage transaction is active. This
-        // call is also harmless because any previous reads or writes should have already completed,
-        // as profile() is called at the end of an operation.
-        _opCtx->recoveryUnit()->abandonSnapshot();
-        _opCtx->recoveryUnit()->setIgnorePrepared(false);
-    }
-
-    ~EnforcePrepareConflictsBlock() {
-        dassert(_opCtx->lockState()->isLocked());
-        dassert(!_opCtx->lockState()->inAWriteUnitOfWork());
-
-        _opCtx->recoveryUnit()->abandonSnapshot();
-        _opCtx->recoveryUnit()->setIgnorePrepared(_originalValue);
-    }
-
-private:
-    OperationContext* _opCtx;
-    bool _originalValue;
-};
-
 }  // namespace
 
 
@@ -188,6 +155,12 @@ void profile(OperationContext* opCtx, NetworkOp op) {
 
             Lock::CollectionLock collLock(opCtx, db->getProfilingNS(), MODE_IX);
 
+            // We are about to enforce prepare conflicts for the OperationContext. But it is illegal
+            // to change the behavior of ignoring prepare conflicts while any storage transaction is
+            // still active. So we need to call abandonSnapshot() to close any open transactions.
+            // This call is also harmless because any previous reads or writes should have already
+            // completed, as profile() is called at the end of an operation.
+            opCtx->recoveryUnit()->abandonSnapshot();
             // The profiler performs writes even after read commands. Ignoring prepare conflicts is
             // not allowed while performing writes, so temporarily enforce prepare conflicts.
             EnforcePrepareConflictsBlock enforcePrepare(opCtx);