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-07-11 15:46:27 +0000 |
| commit | 701795a6dc0a367cb184bf06f844343b31ee884f (patch) | |
| tree | ab30b5adec1ea7c3700750564db2946f280bc6b2 | |
| parent | 39ef61c583b47d764872acc9f3d4c4c168377b5b (diff) | |
| download | mongo-701795a6dc0a367cb184bf06f844343b31ee884f.tar.gz | |
SERVER-64509 Fix ShardRegistry threadpool shutdown order
(cherry picked from commit 077b55e6330264b262d87d296a7f7006fece669e)
(cherry picked from commit 6a1b4f309d741385eb49b1f87ebe94a2781c1411)
| -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 a1195844572..5f721a0111e 100644 --- a/src/mongo/s/client/shard_registry.cpp +++ b/src/mongo/s/client/shard_registry.cpp @@ -259,11 +259,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); } |