SERVER-39035 Specify durable_timestamp when committing prepared transaction.

3 files changed, 5 insertions, 19 deletions

diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 60686355eec..f7c8b4ccacb 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -1312,7 +1312,7 @@ std::map<std::string, ApplyOpMetadata> opsMap = {
          const OplogEntry& entry,
          OplogApplication::Mode mode,
          boost::optional<Timestamp> stableTimestampForRecovery) -> Status {
-         return applyCommitTransaction(opCtx, entry, mode, stableTimestampForRecovery);
+         return applyCommitTransaction(opCtx, entry, mode);
      }}},
     {"abortTransaction",
      {[](OperationContext* opCtx,
diff --git a/src/mongo/db/repl/transaction_oplog_application.cpp b/src/mongo/db/repl/transaction_oplog_application.cpp
index 6628fff7640..b9dbd9a5953 100644
--- a/src/mongo/db/repl/transaction_oplog_application.cpp
+++ b/src/mongo/db/repl/transaction_oplog_application.cpp
@@ -71,8 +71,7 @@ Status _applyTransactionFromOplogChain(OperationContext* opCtx,
 
 Status applyCommitTransaction(OperationContext* opCtx,
                               const repl::OplogEntry& entry,
-                              repl::OplogApplication::Mode mode,
-                              boost::optional<Timestamp> stableTimestampForRecovery) {
+                              repl::OplogApplication::Mode mode) {
     // Return error if run via applyOps command.
     uassert(50987,
             "commitTransaction is only used internally by secondaries.",
@@ -81,20 +80,8 @@ Status applyCommitTransaction(OperationContext* opCtx,
     IDLParserErrorContext ctx("commitTransaction");
     auto commitCommand = CommitTransactionOplogObject::parse(ctx, entry.getObject());
 
-    if (mode == repl::OplogApplication::Mode::kRecovering) {
-        invariant(stableTimestampForRecovery);
-
-        // If the commitTimestamp is before the stableTimestampForRecovery, then the data
-        // already reflects the operations from the transaction.
-        const auto& commitTimestamp = commitCommand.getCommitTimestamp();
-        if (stableTimestampForRecovery.get() > commitTimestamp) {
-            return Status::OK();
-        }
-
-        return _applyTransactionFromOplogChain(opCtx, entry, mode);
-    }
-
-    if (mode == repl::OplogApplication::Mode::kInitialSync) {
+    if (mode == repl::OplogApplication::Mode::kRecovering ||
+        mode == repl::OplogApplication::Mode::kInitialSync) {
         return _applyTransactionFromOplogChain(opCtx, entry, mode);
     }
 
diff --git a/src/mongo/db/repl/transaction_oplog_application.h b/src/mongo/db/repl/transaction_oplog_application.h
index f671f8724f9..ee2c77b722d 100644
--- a/src/mongo/db/repl/transaction_oplog_application.h
+++ b/src/mongo/db/repl/transaction_oplog_application.h
@@ -40,8 +40,7 @@ namespace mongo {
  */
 Status applyCommitTransaction(OperationContext* opCtx,
                               const repl::OplogEntry& entry,
-                              repl::OplogApplication::Mode mode,
-                              boost::optional<Timestamp> stableTimestampForRecovery);
+                              repl::OplogApplication::Mode mode);
 
 /**
  * Apply `abortTransaction` oplog entry.