summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/d_concurrency_test.cpp
diff options
context:
space:
mode:
authorGeert Bosch <geert@mongodb.com>2014-10-07 12:13:21 -0400
committerGeert Bosch <geert@mongodb.com>2014-10-09 18:21:06 -0400
commit5ea4221f81e7af9272e4e687d516bb439ef29498 (patch)
tree8bfee151ed5a434935681e17a9f6e26a8c080a33 /src/mongo/db/concurrency/d_concurrency_test.cpp
parentff10cf8c748997338f51de2de61520e17518758c (diff)
downloadmongo-5ea4221f81e7af9272e4e687d516bb439ef29498.tar.gz
SERVER-14668: Collection level locking for update path
Temporarily disable collection locking for MMAPv1.
Diffstat (limited to 'src/mongo/db/concurrency/d_concurrency_test.cpp')
-rw-r--r--src/mongo/db/concurrency/d_concurrency_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/concurrency/d_concurrency_test.cpp b/src/mongo/db/concurrency/d_concurrency_test.cpp
index 3391eab52a7..ddc59b17bd7 100644
--- a/src/mongo/db/concurrency/d_concurrency_test.cpp
+++ b/src/mongo/db/concurrency/d_concurrency_test.cpp
@@ -133,10 +133,10 @@ namespace mongo {
ASSERT(ls.getLockMode(resIdDb) == newlm::MODE_S);
}
- TEST(DConcurrency, DBWriteTakesX) {
+ TEST(DConcurrency, DBLockTakesX) {
LockState ls;
- Lock::DBWrite dbWrite(&ls, "db");
+ Lock::DBLock dbWrite(&ls, "db", newlm::MODE_X);
const newlm::ResourceId resIdDb(newlm::RESOURCE_DATABASE, string("db"));
ASSERT(ls.getLockMode(resIdDb) == newlm::MODE_X);