diff options
| author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2016-09-15 19:17:01 -0400 |
|---|---|---|
| committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2016-09-15 19:17:01 -0400 |
| commit | c17b1c84bc6c18a47e4215d6b6238ae12d6854fc (patch) | |
| tree | 685bef51dd4376b7a0ec422f20518f6d28cf16ad /src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp | |
| parent | f8212b6b37bea1bead354df86e8485761a519339 (diff) | |
| download | mongo-c17b1c84bc6c18a47e4215d6b6238ae12d6854fc.tar.gz | |
Revert "SERVER-25905 Release all config held distlocks and reacquire balancer distlocks in drain mode on config step up to primary"
This reverts commit f8212b6b37bea1bead354df86e8485761a519339.
Diffstat (limited to 'src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp')
| -rw-r--r-- | src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp b/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp index 6eab41a6bef..27b80627647 100644 --- a/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp +++ b/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp @@ -426,7 +426,8 @@ StatusWith<DistLockHandle> ReplSetDistLockManager::lockWithSessionID(OperationCo } StatusWith<DistLockHandle> ReplSetDistLockManager::tryLockWithLocalWriteConcern( - OperationContext* txn, StringData name, StringData whyMessage, const OID& lockSessionID) { + OperationContext* txn, StringData name, StringData whyMessage) { + const DistLockHandle lockSessionID = OID::gen(); const string who = str::stream() << _processID << ":" << getThreadName(); auto lockStatus = _catalog->grabLock(txn, |