diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-09-17 14:11:30 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-09-17 14:11:32 -0400 |
| commit | 545c26b58fdcf5a725bdda6391937465cb1fd13a (patch) | |
| tree | 8bb80cfa41c2b4b383c8ecb537e3f6adeb1ef8d2 /src/mongo/dbtests/threadedtests.cpp | |
| parent | ba726b4ee22efc2ea9b86b52724e0a4081c16c53 (diff) | |
| download | mongo-545c26b58fdcf5a725bdda6391937465cb1fd13a.tar.gz | |
SERVER-14412 Remove TempReleases from all DBRead paths in dbtest.exe
We should never have TempRelease in DBRead paths.
Diffstat (limited to 'src/mongo/dbtests/threadedtests.cpp')
| -rw-r--r-- | src/mongo/dbtests/threadedtests.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp index f2208e25e42..bdb07bd351f 100644 --- a/src/mongo/dbtests/threadedtests.cpp +++ b/src/mongo/dbtests/threadedtests.cpp @@ -183,9 +183,6 @@ namespace ThreadedTests { else if( i % 7 == 5 ) { { Lock::DBRead r(&lockState, "foo"); - if( sometimes ) { - Lock::TempRelease t(&lockState); - } } { Lock::DBRead r(&lockState, "bar"); @@ -202,9 +199,6 @@ namespace ThreadedTests { ASSERT(lockState.isRecursive()); ASSERT(lockState.isAtLeastReadLocked("foo")); Lock::DBRead r3(&lockState, "local"); - if( sometimes ) { - Lock::TempRelease t(&lockState); - } ASSERT(lockState.isAtLeastReadLocked("foo")); ASSERT(lockState.isAtLeastReadLocked("local")); } @@ -212,10 +206,6 @@ namespace ThreadedTests { // test locking local only -- with no preceding lock { Lock::DBRead x(&lockState, "local"); - //Lock::DBRead y("q"); - if( sometimes ) { - Lock::TempRelease t(&lockState); // we don't temprelease (cant=true) here thus this is just a check that nothing weird happens... - } } { Lock::DBWrite x(&lockState, "local"); @@ -225,24 +215,21 @@ namespace ThreadedTests { } } } else if( q == 1 ) { - { Lock::DBRead x(&lockState, "admin"); } + { + Lock::DBRead x(&lockState, "admin"); + } + { Lock::DBWrite x(&lockState, "admin"); } - } else if( q == 2 ) { - /*Lock::DBWrite x("foo"); - Lock::DBWrite y("admin"); - { Lock::TempRelease t(&lockState); }*/ } else if( q == 3 ) { Lock::DBWrite x(&lockState, "foo"); Lock::DBRead y(&lockState, "admin"); - { Lock::TempRelease t(&lockState); } } else if( q == 4 ) { Lock::DBRead x(&lockState, "foo2"); Lock::DBRead y(&lockState, "admin"); - { Lock::TempRelease t(&lockState); } } else { Lock::DBWrite w(&lockState, "foo"); @@ -253,9 +240,6 @@ namespace ThreadedTests { Lock::DBRead r2(&lockState, "foo"); Lock::DBRead r3(&lockState, "local"); - if( sometimes ) { - Lock::TempRelease t(&lockState); - } } } else { |