SERVER-34048 Temporary fix to not crash embedded when asked for logical session by telling drivers they are disabled by omitting logicalSessionTimeoutMinutes in the isMaster result.

2 files changed, 4 insertions, 1 deletions

diff --git a/src/mongo/db/logical_session_id.h b/src/mongo/db/logical_session_id.h
index a769c19d0f9..90ea3ef6b35 100644
--- a/src/mongo/db/logical_session_id.h
+++ b/src/mongo/db/logical_session_id.h
@@ -52,6 +52,7 @@ class BSONObjBuilder;
 class OperationContext;
 
 const Minutes kLogicalSessionDefaultTimeout = Minutes(30);
+constexpr int localLogicalSessionTimeoutMinutesDisabledValue = -1;
 extern int localLogicalSessionTimeoutMinutes;
 
 inline bool operator==(const LogicalSessionId& lhs, const LogicalSessionId& rhs) {
diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp
index bed3b9aeca2..9475e64dc20 100644
--- a/src/mongo/db/repl/replication_info.cpp
+++ b/src/mongo/db/repl/replication_info.cpp
@@ -357,7 +357,9 @@ public:
         result.appendNumber("maxMessageSizeBytes", MaxMessageSizeBytes);
         result.appendNumber("maxWriteBatchSize", write_ops::kMaxWriteBatchSize);
         result.appendDate("localTime", jsTime());
-        result.append("logicalSessionTimeoutMinutes", localLogicalSessionTimeoutMinutes);
+
+        if (localLogicalSessionTimeoutMinutes != localLogicalSessionTimeoutMinutesDisabledValue)
+            result.append("logicalSessionTimeoutMinutes", localLogicalSessionTimeoutMinutes);
 
         if (MONGO_FAIL_POINT(impersonateFullyUpgradedFutureVersion)) {
             result.append("minWireVersion", WireVersion::FUTURE_WIRE_VERSION_FOR_TESTING);