Revert "SERVER-32677 Fix segmentation fault when converting a replica set to a replicated sharded cluster"r3.6.3-rc1r3.6.3

This reverts commit cad0d35091f98b5c2bb37765861841844bd9e16d.

1 files changed, 1 insertions, 17 deletions

diff --git a/src/mongo/db/s/sharding_initialization_mongod.cpp b/src/mongo/db/s/sharding_initialization_mongod.cpp
index 33699f32919..bccdebf8f21 100644
--- a/src/mongo/db/s/sharding_initialization_mongod.cpp
+++ b/src/mongo/db/s/sharding_initialization_mongod.cpp
@@ -36,8 +36,6 @@
 #include "mongo/client/connection_string.h"
 #include "mongo/client/remote_command_targeter.h"
 #include "mongo/client/remote_command_targeter_factory_impl.h"
-#include "mongo/db/logical_session_cache.h"
-#include "mongo/db/logical_session_cache_factory_mongod.h"
 #include "mongo/db/logical_time_metadata_hook.h"
 #include "mongo/db/logical_time_validator.h"
 #include "mongo/db/operation_context.h"
@@ -109,7 +107,7 @@ Status initializeGlobalShardingStateForMongod(OperationContext* opCtx,
         validator->resetKeyManager();
     }
 
-    auto initializeStatus = initializeGlobalShardingState(
+    return initializeGlobalShardingState(
         opCtx,
         configCS,
         distLockProcessId,
@@ -126,20 +124,6 @@ Status initializeGlobalShardingStateForMongod(OperationContext* opCtx,
         // We only need one task executor here because sharding task executors aren't used for user
         // queries in mongod.
         1);
-
-    if (!initializeStatus.isOK()) {
-        return initializeStatus;
-    }
-
-    const auto serverType = serverGlobalParams.clusterRole == ClusterRole::ConfigServer
-        ? LogicalSessionCacheServer::kConfigServer
-        : LogicalSessionCacheServer::kSharded;
-
-    invariant(LogicalSessionCache::get(opCtx) == nullptr);
-    auto sessionCache = makeLogicalSessionCacheD(opCtx->getServiceContext(), serverType);
-    LogicalSessionCache::set(opCtx->getServiceContext(), std::move(sessionCache));
-
-    return Status::OK();
 }
 
 }  // namespace mongo