diff options
| author | Louis Williams <louis.williams@mongodb.com> | 2018-03-28 13:39:45 -0400 |
|---|---|---|
| committer | Louis Williams <louis.williams@mongodb.com> | 2018-04-30 11:50:37 -0400 |
| commit | 07d7a7095a7ebb116b0d02a4ac396620710e9e77 (patch) | |
| tree | f17d474d953d49cc1d5d130a8a6c38fd975d10a2 /src/mongo/db/catalog_raii_test.cpp | |
| parent | 3d43d9420c12c2f47d614fc6f2546cf80742817e (diff) | |
| download | mongo-07d7a7095a7ebb116b0d02a4ac396620710e9e77.tar.gz | |
SERVER-33674 Require GlobalLocks with deadlines to specify interrupt behavior when interrupted
Diffstat (limited to 'src/mongo/db/catalog_raii_test.cpp')
| -rw-r--r-- | src/mongo/db/catalog_raii_test.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/catalog_raii_test.cpp b/src/mongo/db/catalog_raii_test.cpp index 75d7f74ec63..b824b445148 100644 --- a/src/mongo/db/catalog_raii_test.cpp +++ b/src/mongo/db/catalog_raii_test.cpp @@ -82,7 +82,8 @@ TEST_F(CatalogRAIITestFixture, AutoGetDBDeadline) { } TEST_F(CatalogRAIITestFixture, AutoGetDBGlobalLockDeadline) { - Lock::GlobalLock gLock1(client1.second.get(), MODE_X, Date_t::now()); + Lock::GlobalLock gLock1( + client1.second.get(), MODE_X, Date_t::now(), Lock::InterruptBehavior::kThrow); ASSERT(gLock1.isLocked()); failsWithLockTimeout( [&] { AutoGetDb db(client2.second.get(), nss.db(), MODE_X, Date_t::now() + timeoutMs); }, @@ -150,7 +151,8 @@ TEST_F(CatalogRAIITestFixture, AutoGetCollectionDBLockDeadline) { } TEST_F(CatalogRAIITestFixture, AutoGetCollectionGlobalLockDeadline) { - Lock::GlobalLock gLock1(client1.second.get(), MODE_X, Date_t::now()); + Lock::GlobalLock gLock1( + client1.second.get(), MODE_X, Date_t::now(), Lock::InterruptBehavior::kThrow); ASSERT(client1.second->lockState()->isLocked()); failsWithLockTimeout( [&] { |