SERVER-31265 Mark new sessions as pending so terminateIfTagsDontMatch don't terminate sessions that haven't had their tags set yet. Clear this flag when we get the first set of tags.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp
index 33197d666d2..e29d748aa37 100644
--- a/src/mongo/db/repl/replication_info.cpp
+++ b/src/mongo/db/repl/replication_info.cpp
@@ -288,10 +288,7 @@ public:
         if (internalClientElement) {
             auto session = opCtx->getClient()->session();
             if (session) {
-                // Unset kExternalClientKeepOpen, which is the default for new connections.
-                session->replaceTags(
-                    (session->getTags() & ~transport::Session::kExternalClientKeepOpen) |
-                    transport::Session::kInternalClient);
+                session->replaceTags(session->getTags() | transport::Session::kInternalClient);
             }
 
             uassert(ErrorCodes::TypeMismatch,
@@ -340,6 +337,12 @@ public:
             uassert(ErrorCodes::BadValue,
                     "Missing required field 'maxWireVersion' of 'internalClient'",
                     foundMaxWireVersion);
+        } else {
+            auto session = opCtx->getClient()->session();
+            if (session && !(session->getTags() & transport::Session::kInternalClient)) {
+                session->replaceTags(session->getTags() |
+                                     transport::Session::kExternalClientKeepOpen);
+            }
         }
 
         appendReplicationInfo(opCtx, result, 0);