diff options
| author | Geert Bosch <geert@mongodb.com> | 2019-04-12 13:27:54 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2019-04-15 11:24:05 -0400 |
| commit | 688948927bedd25c4c5c50bc7e6a253feeec4e25 (patch) | |
| tree | c1beee18d1d6acf197455542a0328f0190f8dc70 /src/mongo/db/catalog_raii_test.cpp | |
| parent | 03171bed9efdf0d25054fcddd936ad04db53f4aa (diff) | |
| download | mongo-688948927bedd25c4c5c50bc7e6a253feeec4e25.tar.gz | |
SERVER-40604 Make CollectionLock interruptible
Diffstat (limited to 'src/mongo/db/catalog_raii_test.cpp')
| -rw-r--r-- | src/mongo/db/catalog_raii_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/catalog_raii_test.cpp b/src/mongo/db/catalog_raii_test.cpp index a6c90d830ae..d55f887ff6e 100644 --- a/src/mongo/db/catalog_raii_test.cpp +++ b/src/mongo/db/catalog_raii_test.cpp @@ -133,7 +133,7 @@ TEST_F(CatalogRAIITestFixture, AutoGetOrCreateDbDeadline) { TEST_F(CatalogRAIITestFixture, AutoGetCollectionCollLockDeadline) { Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); - Lock::CollectionLock collLock1(client1.second.get()->lockState(), nss.toString(), MODE_X); + Lock::CollectionLock collLock1(client1.second.get(), nss.toString(), MODE_X); ASSERT(client1.second->lockState()->isCollectionLockedForMode(nss, MODE_X)); failsWithLockTimeout( [&] { @@ -181,7 +181,7 @@ TEST_F(CatalogRAIITestFixture, AutoGetCollectionGlobalLockDeadline) { TEST_F(CatalogRAIITestFixture, AutoGetCollectionDeadlineNow) { Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); - Lock::CollectionLock collLock1(client1.second.get()->lockState(), nss.toString(), MODE_X); + Lock::CollectionLock collLock1(client1.second.get(), nss.toString(), MODE_X); ASSERT(client1.second->lockState()->isCollectionLockedForMode(nss, MODE_X)); failsWithLockTimeout( @@ -199,7 +199,7 @@ TEST_F(CatalogRAIITestFixture, AutoGetCollectionDeadlineNow) { TEST_F(CatalogRAIITestFixture, AutoGetCollectionDeadlineMin) { Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); - Lock::CollectionLock collLock1(client1.second.get()->lockState(), nss.toString(), MODE_X); + Lock::CollectionLock collLock1(client1.second.get(), nss.toString(), MODE_X); ASSERT(client1.second->lockState()->isCollectionLockedForMode(nss, MODE_X)); failsWithLockTimeout( |