diff options
| author | Geert Bosch <geert@mongodb.com> | 2016-06-29 16:26:56 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2016-06-30 08:41:03 -0400 |
| commit | 12f34245898909677942e69f196f113743150123 (patch) | |
| tree | 1687fa439c7edbed31a0d60931a3c42d8535b2aa /src/mongo/db/concurrency | |
| parent | 4398dfaceec83ce195f2c27847535dc3b10b0ee4 (diff) | |
| download | mongo-12f34245898909677942e69f196f113743150123.tar.gz | |
SERVER-24841 LockerImpl::getWaitingResource should ignore STATUS_NEW requests
Diffstat (limited to 'src/mongo/db/concurrency')
| -rw-r--r-- | src/mongo/db/concurrency/lock_state.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp index 2d167091b52..b16410d90b2 100644 --- a/src/mongo/db/concurrency/lock_state.cpp +++ b/src/mongo/db/concurrency/lock_state.cpp @@ -524,7 +524,8 @@ ResourceId LockerImpl<IsForMMAPV1>::getWaitingResource() const { LockRequestsMap::ConstIterator it = _requests.begin(); while (!it.finished()) { - if (it->status != LockRequest::STATUS_GRANTED) { + if (it->status == LockRequest::STATUS_WAITING || + it->status == LockRequest::STATUS_CONVERTING) { return it.key(); } |