SERVER-37339 Sharding state is set to initialized on Grid before sharding components are fully initialized

2 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 69471e9e65b..bccf4a86e31 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -561,6 +561,8 @@ ExitCode _initAndListen(int listenPort) {
             ShardingCatalogManager::create(
                 startupOpCtx->getServiceContext(),
                 makeShardingTaskExecutor(executor::makeNetworkInterface("AddShard-TaskExecutor")));
+
+            Grid::get(startupOpCtx.get())->setShardingInitialized();
         } else if (replSettings.usingReplSets()) {  // standalone replica set
             auto keysCollectionClient = stdx::make_unique<KeysCollectionClientDirect>();
             auto keyManager = std::make_shared<KeysCollectionManager>(
diff --git a/src/mongo/db/s/sharding_initialization_mongod.cpp b/src/mongo/db/s/sharding_initialization_mongod.cpp
index b24cab09a4c..70aac5722f1 100644
--- a/src/mongo/db/s/sharding_initialization_mongod.cpp
+++ b/src/mongo/db/s/sharding_initialization_mongod.cpp
@@ -133,6 +133,8 @@ void initializeShardingEnvironmentOnShardServer(OperationContext* opCtx,
     PeriodicBalancerConfigRefresher::get(opCtx).onShardingInitialization(opCtx->getServiceContext(),
                                                                          isStandaloneOrPrimary);
 
+    Grid::get(opCtx)->setShardingInitialized();
+
     LOG(0) << "Finished initializing sharding components for "
            << (isStandaloneOrPrimary ? "primary" : "secondary") << " node.";
 }
@@ -399,8 +401,6 @@ void initializeGlobalShardingStateForMongoD(OperationContext* opCtx,
         replCoord->getMemberState().primary()) {
         LogicalTimeValidator::get(opCtx)->enableKeyGenerator(opCtx, true);
     }
-
-    Grid::get(opCtx)->setShardingInitialized();
 }
 
 }  // namespace mongo