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

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/db/pipeline/document_source_out.h b/src/mongo/db/pipeline/document_source_out.h
index 674aea38657..ce9e4282b14 100644
--- a/src/mongo/db/pipeline/document_source_out.h
+++ b/src/mongo/db/pipeline/document_source_out.h
@@ -29,6 +29,7 @@
 
 #pragma once
 
+#include "mongo/db/db_raii.h"
 #include "mongo/db/pipeline/document_source.h"
 #include "mongo/db/pipeline/document_source_out_gen.h"
 #include "mongo/db/write_concern_options.h"
@@ -46,23 +47,21 @@ class OutStageWriteBlock {
     OperationContext* _opCtx;
     repl::ReadConcernArgs _originalArgs;
     RecoveryUnit::ReadSource _originalSource;
-    bool _originalIgnorePrepared;
+    EnforcePrepareConflictsBlock _enforcePrepareConflictsBlock;
 
 public:
-    OutStageWriteBlock(OperationContext* opCtx) : _opCtx(opCtx) {
+    OutStageWriteBlock(OperationContext* opCtx)
+        : _opCtx(opCtx), _enforcePrepareConflictsBlock(opCtx) {
         _originalArgs = repl::ReadConcernArgs::get(_opCtx);
         _originalSource = _opCtx->recoveryUnit()->getTimestampReadSource();
-        _originalIgnorePrepared = _opCtx->recoveryUnit()->getIgnorePrepared();
 
         repl::ReadConcernArgs::get(_opCtx) = repl::ReadConcernArgs();
         _opCtx->recoveryUnit()->setTimestampReadSource(RecoveryUnit::kUnset);
-        _opCtx->recoveryUnit()->setIgnorePrepared(false);
     }
 
     ~OutStageWriteBlock() {
         repl::ReadConcernArgs::get(_opCtx) = _originalArgs;
         _opCtx->recoveryUnit()->setTimestampReadSource(_originalSource);
-        _opCtx->recoveryUnit()->setIgnorePrepared(_originalIgnorePrepared);
     }
 };