diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2020-02-07 15:21:38 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-10 22:26:40 +0000 |
| commit | 6598a19df0d9f35c4f4cc9524daaf5e32bb63272 (patch) | |
| tree | 60fff9415197ad37f36e083de311395cffc3be08 /src/mongo | |
| parent | eb7f1c54a54bf5eb82f633b60e7c918a02adb55c (diff) | |
| download | mongo-6598a19df0d9f35c4f4cc9524daaf5e32bb63272.tar.gz | |
SERVER-46034 no deadline in test setup lock
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/db/catalog_raii_test.cpp | 15 | ||||
| -rw-r--r-- | src/mongo/db/db_raii_test.cpp | 3 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/mongo/db/catalog_raii_test.cpp b/src/mongo/db/catalog_raii_test.cpp index 97c67cd0f25..b717c19b2b4 100644 --- a/src/mongo/db/catalog_raii_test.cpp +++ b/src/mongo/db/catalog_raii_test.cpp @@ -94,8 +94,7 @@ TEST_F(CatalogRAIITestFixture, AutoGetDBDeadline) { } TEST_F(CatalogRAIITestFixture, AutoGetDBGlobalLockDeadline) { - Lock::GlobalLock gLock1( - client1.second.get(), MODE_X, Date_t::now(), Lock::InterruptBehavior::kThrow); + Lock::GlobalLock gLock1(client1.second.get(), MODE_X); ASSERT(gLock1.isLocked()); failsWithLockTimeout( [&] { AutoGetDb db(client2.second.get(), nss.db(), MODE_X, Date_t::now() + timeoutMs); }, @@ -105,7 +104,7 @@ TEST_F(CatalogRAIITestFixture, AutoGetDBGlobalLockDeadline) { TEST_F(CatalogRAIITestFixture, AutoGetDBDeadlineNow) { Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); - AutoGetDb db(client2.second.get(), nss.db(), MODE_IX, Date_t::now()); + AutoGetDb db(client2.second.get(), nss.db(), MODE_IX); failsWithLockTimeout( [&] { AutoGetDb db(client2.second.get(), nss.db(), MODE_X, Date_t::now()); }, Milliseconds(0)); @@ -114,10 +113,9 @@ TEST_F(CatalogRAIITestFixture, AutoGetDBDeadlineNow) { TEST_F(CatalogRAIITestFixture, AutoGetDBDeadlineMin) { Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); - AutoGetDb db(client2.second.get(), nss.db(), MODE_IX, Date_t::now()); - failsWithLockTimeout( - [&] { AutoGetDb db(client2.second.get(), nss.db(), MODE_X, Date_t::now()); }, - Milliseconds(0)); + AutoGetDb db(client2.second.get(), nss.db(), MODE_IX); + failsWithLockTimeout([&] { AutoGetDb db(client2.second.get(), nss.db(), MODE_X, Date_t{}); }, + Milliseconds(0)); } TEST_F(CatalogRAIITestFixture, AutoGetOrCreateDbDeadline) { @@ -161,8 +159,7 @@ TEST_F(CatalogRAIITestFixture, AutoGetCollectionDBLockDeadline) { } TEST_F(CatalogRAIITestFixture, AutoGetCollectionGlobalLockDeadline) { - Lock::GlobalLock gLock1( - client1.second.get(), MODE_X, Date_t::now(), Lock::InterruptBehavior::kThrow); + Lock::GlobalLock gLock1(client1.second.get(), MODE_X); ASSERT(client1.second->lockState()->isLocked()); failsWithLockTimeout( [&] { diff --git a/src/mongo/db/db_raii_test.cpp b/src/mongo/db/db_raii_test.cpp index 0ef79af2757..73a072aa86a 100644 --- a/src/mongo/db/db_raii_test.cpp +++ b/src/mongo/db/db_raii_test.cpp @@ -104,8 +104,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDBLockDeadline) { } TEST_F(DBRAIITestFixture, AutoGetCollectionForReadGlobalLockDeadline) { - Lock::GlobalLock gLock1( - client1.second.get(), MODE_X, Date_t::now(), Lock::InterruptBehavior::kThrow); + Lock::GlobalLock gLock1(client1.second.get(), MODE_X); ASSERT(client1.second->lockState()->isLocked()); failsWithLockTimeout( [&] { |