diff options
| author | Geert Bosch <geert@mongodb.com> | 2017-07-08 00:24:03 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2017-07-18 11:22:25 -0400 |
| commit | 8281fff6b58911c84b0ba53a4a557ebf4dced10b (patch) | |
| tree | 7a505e2e77e6ee343e4a9f07e49d1917c169c754 /src/mongo/db/concurrency | |
| parent | 32da960b3d4f80e4005bfcc21dd56067353d64fb (diff) | |
| download | mongo-8281fff6b58911c84b0ba53a4a557ebf4dced10b.tar.gz | |
SERVER-30106 Allow syncTail replication to write to drop-pending collections
Reinstated after revert in a1c67941bf08c69cab04eba20bc9ce9a763e1c7f
Diffstat (limited to 'src/mongo/db/concurrency')
| -rw-r--r-- | src/mongo/db/concurrency/lock_state.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp index 710de4ac234..721067e3aad 100644 --- a/src/mongo/db/concurrency/lock_state.cpp +++ b/src/mongo/db/concurrency/lock_state.cpp @@ -505,6 +505,8 @@ 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: |