diff options
author | Henrik Edin <henrik.edin@mongodb.com> | 2018-03-12 11:14:15 -0400 |
---|---|---|
committer | Henrik Edin <henrik.edin@mongodb.com> | 2018-03-26 15:54:16 -0400 |
commit | af600c3876a26f62d8dde93bf769fc4ca3054072 (patch) | |
tree | ecef32a9b3c6c54501651168cce48093e76e9858 /src/mongo/executor | |
parent | 2676a176759359c8614c0e37b267198259b6789f (diff) | |
download | mongo-af600c3876a26f62d8dde93bf769fc4ca3054072.tar.gz |
SERVER-30170 Embedded can now shutdown and re-initialize.
- ServiceContext* is now closer to be an instance context for the database. We still don't support multiple instances but I wrote the new code with this in mind. Teardown and reinitialize then becomes a matter of being able to delete and re-create the ServiceContext*.
- Use the new MONGO_INITIALIZER that supports deinit/reinit to be able to re-initialize global systems that are decorations on ServiceContext.
- Move creation/destruction of ServiceContext* out of MONGO_INITIALIZER. This so we can hold an exclusive lock during as much as possible of the shutdown (like how mongod does)
- New ServiceContext registrer where we can link in different implementations of ServiceContext (replaces the SetGlobalEnvironment MONGO_INITIALIZER)
- As a result the SetGlobalEnvironment prerequisite for MONGO_INITIALIZERs is gone.
- The ServiceContext is passed to runGlobalInitializers, put in InitializationContext/DeinitializationContext so the initializers know which context they operate on.
Diffstat (limited to 'src/mongo/executor')
-rw-r--r-- | src/mongo/executor/connection_pool.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/executor/connection_pool.cpp b/src/mongo/executor/connection_pool.cpp index 43d061db5a8..c00fe1c739b 100644 --- a/src/mongo/executor/connection_pool.cpp +++ b/src/mongo/executor/connection_pool.cpp @@ -280,7 +280,9 @@ ConnectionPool::ConnectionPool(std::unique_ptr<DependentTypeFactoryInterface> im } ConnectionPool::~ConnectionPool() { - if (_manager) { + // If we're currently destroying the service context the _manager is already deleted and this + // pointer dangles. No need for cleanup in that case. + if (hasGlobalServiceContext() && _manager) { _manager->remove(this); } } |