SERVER-37348 Make replication applier batches uninterruptible

1 files changed, 8 insertions, 3 deletions

diff --git a/src/mongo/db/session_catalog_mongod.cpp b/src/mongo/db/session_catalog_mongod.cpp
index 7ed1d5359af..f99cce19ef8 100644
--- a/src/mongo/db/session_catalog_mongod.cpp
+++ b/src/mongo/db/session_catalog_mongod.cpp
@@ -242,7 +242,7 @@ void MongoDOperationContextSession::checkOut(OperationContext* opCtx, const std:
 
 MongoDOperationContextSessionWithoutRefresh::MongoDOperationContextSessionWithoutRefresh(
     OperationContext* opCtx)
-    : _operationContextSession(opCtx) {
+    : _operationContextSession(opCtx), _opCtx(opCtx) {
     invariant(!opCtx->getClient()->isInDirectClient());
     const auto clientTxnNumber = *opCtx->getTxnNumber();
 
@@ -250,7 +250,12 @@ MongoDOperationContextSessionWithoutRefresh::MongoDOperationContextSessionWithou
     txnParticipant.beginOrContinueTransactionUnconditionally(opCtx, clientTxnNumber);
 }
 
-MongoDOperationContextSessionWithoutRefresh::~MongoDOperationContextSessionWithoutRefresh() =
-    default;
+MongoDOperationContextSessionWithoutRefresh::~MongoDOperationContextSessionWithoutRefresh() {
+    const auto txnParticipant = TransactionParticipant::get(_opCtx);
+    // A session on secondaries should never be checked back in with a TransactionParticipant that
+    // isn't prepared, aborted, or committed.
+    invariant(!txnParticipant.inMultiDocumentTransaction() ||
+              txnParticipant.transactionIsPrepared());
+}
 
 }  // namespace mongo