SERVER-40466 Unify checks for being in a multi-document transaction

(cherry picked from commit 77967c90b1a521108c052af235ce7de9742aa95e)

SERVER-42755 recover_prepared_txn_with_multikey_write.js should verify absence of prepare conflicts on catalog after restart.

(cherry picked from commit eaf81228328738b685532c7eb10f833362434061)

SERVER-42750 Set opCtx->inMultiDocumentTransaction() in transaction recovery.

(cherry picked from commit 16c17677704a4f979381d593106a0c356088fd30)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/db/kill_sessions_local.cpp b/src/mongo/db/kill_sessions_local.cpp
index 8c217cb7e25..c44234c7568 100644
--- a/src/mongo/db/kill_sessions_local.cpp
+++ b/src/mongo/db/kill_sessions_local.cpp
@@ -91,7 +91,7 @@ void killSessionsAbortUnpreparedTransactions(OperationContext* opCtx,
         matcher,
         [](const ObservableSession& session) {
             auto participant = TransactionParticipant::get(session);
-            return participant.inMultiDocumentTransaction() && !participant.transactionIsPrepared();
+            return participant.transactionIsOpen() && !participant.transactionIsPrepared();
         },
         [](OperationContext* opCtx, const SessionToKill& session) {
             TransactionParticipant::get(session).abortTransactionIfNotPrepared(opCtx);
@@ -138,7 +138,7 @@ void killSessionsLocalShutdownAllTransactions(OperationContext* opCtx) {
     killSessionsAction(opCtx,
                        matcherAllSessions,
                        [](const ObservableSession& session) {
-                           return TransactionParticipant::get(session).inMultiDocumentTransaction();
+                           return TransactionParticipant::get(session).transactionIsOpen();
                        },
                        [](OperationContext* opCtx, const SessionToKill& session) {
                            TransactionParticipant::get(session).shutdown(opCtx);