From 756ad8eb9c7566b186f8e51ed20e16c21b44b566 Mon Sep 17 00:00:00 2001
From: Tess Avitabile <tess.avitabile@mongodb.com>
Date: Mon, 18 May 2020 08:36:12 -0400
Subject: SERVER-48265 Fix and-ordering when appending topology version to
 shutdown errors

---
 src/mongo/db/service_entry_point_common.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp
index 9f0349a2f20..4796bd20a44 100644
--- a/src/mongo/db/service_entry_point_common.cpp
+++ b/src/mongo/db/service_entry_point_common.cpp
@@ -514,7 +514,7 @@ void appendErrorLabelsAndTopologyVersion(OperationContext* opCtx,
     const auto shouldAppendTopologyVersion =
         (replCoord->getReplicationMode() == repl::ReplicationCoordinator::modeReplSet &&
          isNotMasterError) ||
-        (replCoord->inQuiesceMode() && isShutdownError);
+        (isShutdownError && replCoord->inQuiesceMode());
 
     if (!shouldAppendTopologyVersion) {
         return;
-- 
cgit v1.2.1