SERVER-39996 Moved setting ignorePrepared behavior outside of waitForReadConcern.

1 files changed, 10 insertions, 7 deletions

diff --git a/src/mongo/db/service_entry_point_mongod.cpp b/src/mongo/db/service_entry_point_mongod.cpp
index 5435e14b49a..5f769f4d2b2 100644
--- a/src/mongo/db/service_entry_point_mongod.cpp
+++ b/src/mongo/db/service_entry_point_mongod.cpp
@@ -64,17 +64,20 @@ public:
         return mongo::lockedForWriting();
     }
 
-    void waitForReadConcern(OperationContext* opCtx,
-                            const CommandInvocation* invocation,
-                            const OpMsgRequest& request) const override {
+    void setPrepareConflictBehaviorForReadConcern(
+        OperationContext* opCtx, const CommandInvocation* invocation) const override {
         const auto prepareConflictBehavior = invocation->canIgnorePrepareConflicts()
             ? PrepareConflictBehavior::kIgnoreConflicts
             : PrepareConflictBehavior::kEnforce;
+        mongo::setPrepareConflictBehaviorForReadConcern(
+            opCtx, repl::ReadConcernArgs::get(opCtx), prepareConflictBehavior);
+    }
 
-        Status rcStatus = mongo::waitForReadConcern(opCtx,
-                                                    repl::ReadConcernArgs::get(opCtx),
-                                                    invocation->allowsAfterClusterTime(),
-                                                    prepareConflictBehavior);
+    void waitForReadConcern(OperationContext* opCtx,
+                            const CommandInvocation* invocation,
+                            const OpMsgRequest& request) const override {
+        Status rcStatus = mongo::waitForReadConcern(
+            opCtx, repl::ReadConcernArgs::get(opCtx), invocation->allowsAfterClusterTime());
 
         if (!rcStatus.isOK()) {
             if (ErrorCodes::isExceededTimeLimitError(rcStatus.code())) {