SERVER-39996 Moved setting ignorePrepared behavior outside of waitForReadConcern.

1 files changed, 17 insertions, 4 deletions

diff --git a/src/mongo/db/read_concern.h b/src/mongo/db/read_concern.h
index c9ac7f08e1c..cdb4a968682 100644
--- a/src/mongo/db/read_concern.h
+++ b/src/mongo/db/read_concern.h
@@ -45,16 +45,29 @@ class SpeculativeMajorityReadInfo;
 }  // namespace repl
 
 /**
+ * Sets the prepare conflict behavior for a command.
+ *
+ * If the prepareConflictBehavior requested is to ignore prepare conflicts, then readConcernArgs
+ * are used to verify if the command is safe to ignore prepare conflicts, and if not, we
+ * enforce prepare conflicts.
+ */
+extern MONGO_DECLARE_SHIM((OperationContext * opCtx,
+                           const repl::ReadConcernArgs& readConcernArgs,
+                           PrepareConflictBehavior prepareConflictBehavior)
+                              ->void) setPrepareConflictBehaviorForReadConcern;
+
+/**
  * Given the specified read concern arguments, performs checks that the read concern can actually be
  * satisfied given the current state of the server and if so calls into the replication subsystem to
  * perform the wait. If allowAfterClusterTime is false returns an error if afterClusterTime is
- * set on the readConcernArgs. Both cmdName and readConcernArgs are used to determine whether or not
- * prepare conflicts can be ignored.
+ * set on the readConcernArgs.
+ *
+ * Note: Callers should use setPrepareConflictBehaviorForReadConcern method to set the desired
+ * prepare conflict behavior for their command.
  */
 extern MONGO_DECLARE_SHIM((OperationContext * opCtx,
                            const repl::ReadConcernArgs& readConcernArgs,
-                           bool allowAfterClusterTime,
-                           PrepareConflictBehavior prepareConflictBehavior)
+                           bool allowAfterClusterTime)
                               ->Status) waitForReadConcern;
 
 /*