diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2019-01-11 14:20:18 -0500 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2019-01-11 16:20:40 -0500 |
commit | 1bd1b3644378b76e5ff42bb8c6bee8a640e9a866 (patch) | |
tree | 9afb575c265e630e7cd293740520266625806b27 /src/mongo/db/session_catalog.h | |
parent | 424621d33255e28cf5f4988935a0d175f6e9fd78 (diff) | |
download | mongo-1bd1b3644378b76e5ff42bb8c6bee8a640e9a866.tar.gz |
SERVER-38810 Temporarily do not hold the client lock in ObservableSession in order to avoid deadlock
Diffstat (limited to 'src/mongo/db/session_catalog.h')
-rw-r--r-- | src/mongo/db/session_catalog.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mongo/db/session_catalog.h b/src/mongo/db/session_catalog.h index c22c96ff8ba..a3f67620865 100644 --- a/src/mongo/db/session_catalog.h +++ b/src/mongo/db/session_catalog.h @@ -278,8 +278,7 @@ private: return {}; } - ObservableSession(WithLock wl, Session& session) - : _session(&session), _clientLock(_lockClientForSession(std::move(wl), _session)) {} + ObservableSession(WithLock wl, Session& session) : _session(&session) {} /** * Returns whether 'kill' has been called on this session. @@ -293,7 +292,6 @@ private: void _markNotKilled(WithLock sessionCatalogLock, SessionCatalog::KillToken killToken); Session* _session; - stdx::unique_lock<Client> _clientLock; }; |