summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency
diff options
context:
space:
mode:
authorGeert Bosch <geert@mongodb.com>2017-07-15 13:53:13 -0400
committerGeert Bosch <geert@mongodb.com>2017-07-15 13:53:13 -0400
commita1c67941bf08c69cab04eba20bc9ce9a763e1c7f (patch)
tree1eeeb24340e0b20e8a677dcf1298f7ae00f20d4c /src/mongo/db/concurrency
parentd8afe01c37aa24bef255e8aea4ec6882df71b1dd (diff)
downloadmongo-a1c67941bf08c69cab04eba20bc9ce9a763e1c7f.tar.gz
Revert "SERVER-30106 Allow syncTail replication to write to drop-pending collections"
This reverts commit d8afe01c37aa24bef255e8aea4ec6882df71b1dd.
Diffstat (limited to 'src/mongo/db/concurrency')
-rw-r--r--src/mongo/db/concurrency/lock_state.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp
index 721067e3aad..710de4ac234 100644
--- a/src/mongo/db/concurrency/lock_state.cpp
+++ b/src/mongo/db/concurrency/lock_state.cpp
@@ -505,8 +505,6 @@ bool LockerImpl<IsForMMAPV1>::isCollectionLockedForMode(StringData ns, LockMode
const ResourceId resIdDb(RESOURCE_DATABASE, nss.db());
LockMode dbMode = getLockMode(resIdDb);
- if (!shouldConflictWithSecondaryBatchApplication())
- return true;
switch (dbMode) {
case MODE_NONE: