diff options
| author | Tommaso Tocci <tommaso.tocci@mongodb.com> | 2022-03-15 16:45:20 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-15 17:58:08 +0000 |
| commit | 077b55e6330264b262d87d296a7f7006fece669e (patch) | |
| tree | 6e59db75b3b32b4cb28127c39505f94698c261a2 | |
| parent | 83cbc410d85ff65a38abb2b6e60ad9af3107f455 (diff) | |
| download | mongo-077b55e6330264b262d87d296a7f7006fece669e.tar.gz | |
SERVER-64509 Fix ShardRegistry threadpool shutdown order
| -rw-r--r-- | src/mongo/s/client/shard_registry.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp index f1810977542..90bff604cbf 100644 --- a/src/mongo/s/client/shard_registry.cpp +++ b/src/mongo/s/client/shard_registry.cpp @@ -243,11 +243,12 @@ void ShardRegistry::shutdownPeriodicReloader() { } void ShardRegistry::shutdown() { - shutdownPeriodicReloader(); - if (!_isShutdown.load()) { LOGV2_DEBUG(4620235, 1, "Shutting down shard registry"); _threadPool.shutdown(); + + shutdownPeriodicReloader(); + _threadPool.join(); _isShutdown.store(true); } |