SERVER-21670: Remove obsolete enableCollectionLevelLocking server parameter

1 files changed, 12 insertions, 31 deletions

diff --git a/src/mongo/db/concurrency/d_concurrency.cpp b/src/mongo/db/concurrency/d_concurrency.cpp
index a34c980f749..f086379a9c8 100644
--- a/src/mongo/db/concurrency/d_concurrency.cpp
+++ b/src/mongo/db/concurrency/d_concurrency.cpp
@@ -40,11 +40,6 @@
 #include "mongo/util/stacktrace.h"
 
 namespace mongo {
-namespace {
-
-//  SERVER-14668: Remove or invert sense once MMAPv1 CLL can be default
-MONGO_EXPORT_STARTUP_SERVER_PARAMETER(enableCollectionLocking, bool, true);
-}  // namespace
 
 Lock::TempRelease::TempRelease(Locker* lockState)
     : _lockState(lockState),
@@ -107,17 +102,13 @@ Lock::DBLock::DBLock(Locker* locker, StringData db, LockMode mode)
     // Need to acquire the flush lock
     _locker->lockMMAPV1Flush();
 
-    if (supportsDocLocking() || enableCollectionLocking) {
-        // The check for the admin db is to ensure direct writes to auth collections
-        // are serialized (see SERVER-16092).
-        if ((_id == resourceIdAdminDB) && !isSharedLockMode(_mode)) {
-            _mode = MODE_X;
-        }
-
-        invariant(LOCK_OK == _locker->lock(_id, _mode));
-    } else {
-        invariant(LOCK_OK == _locker->lock(_id, isSharedLockMode(_mode) ? MODE_S : MODE_X));
+    // The check for the admin db is to ensure direct writes to auth collections
+    // are serialized (see SERVER-16092).
+    if ((_id == resourceIdAdminDB) && !isSharedLockMode(_mode)) {
+        _mode = MODE_X;
     }
+
+    invariant(LOCK_OK == _locker->lock(_id, _mode));
 }
 
 Lock::DBLock::~DBLock() {
@@ -134,11 +125,7 @@ void Lock::DBLock::relockWithMode(LockMode newMode) {
     _locker->unlock(_id);
     _mode = newMode;
 
-    if (supportsDocLocking() || enableCollectionLocking) {
-        invariant(LOCK_OK == _locker->lock(_id, _mode));
-    } else {
-        invariant(LOCK_OK == _locker->lock(_id, isSharedLockMode(_mode) ? MODE_S : MODE_X));
-    }
+    invariant(LOCK_OK == _locker->lock(_id, _mode));
 }
 
 
@@ -150,28 +137,22 @@ Lock::CollectionLock::CollectionLock(Locker* lockState, StringData ns, LockMode
                                           isSharedLockMode(mode) ? MODE_IS : MODE_IX));
     if (supportsDocLocking()) {
         _lockState->lock(_id, mode);
-    } else if (enableCollectionLocking) {
+    } else {
         _lockState->lock(_id, isSharedLockMode(mode) ? MODE_S : MODE_X);
     }
 }
 
 Lock::CollectionLock::~CollectionLock() {
-    if (supportsDocLocking() || enableCollectionLocking) {
-        _lockState->unlock(_id);
-    }
+    _lockState->unlock(_id);
 }
 
 void Lock::CollectionLock::relockAsDatabaseExclusive(Lock::DBLock& dbLock) {
-    if (supportsDocLocking() || enableCollectionLocking) {
-        _lockState->unlock(_id);
-    }
+    _lockState->unlock(_id);
 
     dbLock.relockWithMode(MODE_X);
 
-    if (supportsDocLocking() || enableCollectionLocking) {
-        // don't need the lock, but need something to unlock in the destructor
-        _lockState->lock(_id, MODE_IX);
-    }
+    // don't need the lock, but need something to unlock in the destructor
+    _lockState->lock(_id, MODE_IX);
 }
 
 namespace {