diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-03-07 16:04:15 -0500 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-03-07 16:13:15 -0500 |
commit | eb90269e893cd978d880c403d344343a9b9eeacd (patch) | |
tree | f0236d5273d1bf8bf9335e3b338f63d411145606 /src/mongo/db/key_generator_update_test.cpp | |
parent | 8784e594b52f70a14a7780986d841740a1273224 (diff) | |
download | mongo-eb90269e893cd978d880c403d344343a9b9eeacd.tar.gz |
SERVER-29908 Fix broken keys_collection_manager_sharding_test
Diffstat (limited to 'src/mongo/db/key_generator_update_test.cpp')
-rw-r--r-- | src/mongo/db/key_generator_update_test.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/mongo/db/key_generator_update_test.cpp b/src/mongo/db/key_generator_update_test.cpp index 5c30b3214eb..3aef06bdf67 100644 --- a/src/mongo/db/key_generator_update_test.cpp +++ b/src/mongo/db/key_generator_update_test.cpp @@ -36,7 +36,7 @@ #include "mongo/db/keys_collection_client_sharded.h" #include "mongo/db/keys_collection_document.h" #include "mongo/db/logical_clock.h" -#include "mongo/db/namespace_string.h" +#include "mongo/s/catalog/dist_lock_manager_mock.h" #include "mongo/s/config_server_test_fixture.h" #include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" @@ -60,6 +60,15 @@ protected: return _catalogClient.get(); } + /** + * Intentionally create a DistLockManagerMock, even though this is a config serfver test in + * order to avoid the lock pinger thread from executing and accessing uninitialized state. + */ + std::unique_ptr<DistLockManager> makeDistLockManager( + std::unique_ptr<DistLockCatalog> distLockCatalog) override { + return stdx::make_unique<DistLockManagerMock>(std::move(distLockCatalog)); + } + private: std::unique_ptr<KeysCollectionClient> _catalogClient; }; |