summaryrefslogtreecommitdiff
path: root/src/mongo/db/s
diff options
context:
space:
mode:
authorTommaso Tocci <tommaso.tocci@mongodb.com>2022-07-20 13:36:08 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-07-20 14:07:17 +0000
commit02d294a410ada9b804ef3909139d64203ed674d6 (patch)
tree6485c5fc1848532e479fd1d9f9df3bccc94f1aba /src/mongo/db/s
parent9743d69c7dbc92fd5abcf9c799daff89e30ca233 (diff)
downloadmongo-02d294a410ada9b804ef3909139d64203ed674d6.tar.gz
SERVER-68161 Do not wait for ShardRegistry reload at startup
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r--src/mongo/db/s/sharding_initialization_mongod.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/s/sharding_initialization_mongod.cpp b/src/mongo/db/s/sharding_initialization_mongod.cpp
index 9d423f65057..ff2b685cb93 100644
--- a/src/mongo/db/s/sharding_initialization_mongod.cpp
+++ b/src/mongo/db/s/sharding_initialization_mongod.cpp
@@ -495,11 +495,10 @@ void ShardingInitializationMongoD::onInitialDataAvailable(OperationContext* opCt
// This function may take the global lock.
auto shardingInitialized = initializeShardingAwarenessIfNeeded(opCtx);
if (shardingInitialized) {
- auto status = waitForShardRegistryReload(opCtx);
+ auto status = loadGlobalSettingsFromConfigServer(opCtx);
if (!status.isOK()) {
LOGV2(6460100,
- "Error loading shard registry at startup {error}",
- "Error loading shard registry at startup",
+ "Error loading global settings from config server at startup",
"error"_attr = redact(status));
}
}