SERVER-37897 Disable table logging for data files when enableMajorityReadConcern=false

1 files changed, 15 insertions, 0 deletions

diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
index 69e9286b649..6eeb980f5a6 100644
--- a/src/mongo/db/repl/rs_rollback.cpp
+++ b/src/mongo/db/repl/rs_rollback.cpp
@@ -1405,6 +1405,21 @@ void rollback_internal::syncFixUp(OperationContext* opCtx,
     log() << "Rollback deleted " << deletes << " documents and updated " << updates
           << " documents.";
 
+    // When majority read concern is disabled, the stable timestamp may be ahead of the common
+    // point. Force the stable timestamp back to the common point.
+    if (!serverGlobalParams.enableMajorityReadConcern) {
+        const bool force = true;
+        log() << "Forcing the stable timestamp to " << fixUpInfo.commonPoint.getTimestamp();
+        opCtx->getServiceContext()->getStorageEngine()->setStableTimestamp(
+            fixUpInfo.commonPoint.getTimestamp(), boost::none, force);
+
+        // We must wait for a checkpoint before truncating oplog, so that if we crash after
+        // truncating oplog, we are guaranteed to recover from a checkpoint that includes all of the
+        // writes performed during the rollback.
+        log() << "Waiting for a stable checkpoint";
+        opCtx->recoveryUnit()->waitUntilUnjournaledWritesDurable();
+    }
+
     log() << "Truncating the oplog at " << fixUpInfo.commonPoint.toString() << " ("
           << fixUpInfo.commonPointOurDiskloc << "), non-inclusive";