summaryrefslogtreecommitdiff
path: root/src/mongo/embedded
diff options
context:
space:
mode:
authorKevin Pulo <kevin.pulo@mongodb.com>2020-09-25 09:24:20 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-28 01:47:59 +0000
commit7cac84e82eec3e9292cae02f5d85c2cacc30c4a4 (patch)
treebbd3b38e092f6e83dce9e57ea72460e33b132977 /src/mongo/embedded
parent3681b03baaa6dd30e9ebc237365b81d755412e7b (diff)
downloadmongo-7cac84e82eec3e9292cae02f5d85c2cacc30c4a4.tar.gz
SERVER-51134 ensure that RSASR has no services when destroyed, and embedded must runGlobalDeinitializers() later
Diffstat (limited to 'src/mongo/embedded')
-rw-r--r--src/mongo/embedded/embedded.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/embedded/embedded.cpp b/src/mongo/embedded/embedded.cpp
index 7f12858949d..1a389abeab9 100644
--- a/src/mongo/embedded/embedded.cpp
+++ b/src/mongo/embedded/embedded.cpp
@@ -173,13 +173,13 @@ void shutdown(ServiceContext* srvContext) {
if (serviceContext->getStorageEngine()) {
shutdownGlobalStorageEngineCleanly(serviceContext);
}
-
- Status status = mongo::runGlobalDeinitializers();
- uassertStatusOKWithContext(status, "Global deinitilization failed");
}
}
setGlobalServiceContext(nullptr);
+ Status status = mongo::runGlobalDeinitializers();
+ uassertStatusOKWithContext(status, "Global deinitilization failed");
+
LOGV2_OPTIONS(22551, {LogComponent::kControl}, "now exiting");
}