diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-11-13 09:47:08 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-11-13 15:37:43 -0500 |
| commit | e13e069902099d601c6cf64def9fc374082a629e (patch) | |
| tree | 9fb8cc4f3a3c35b7068c7a724faf20270063d585 /src | |
| parent | f69f5a743962b6350d5830db0d03aaa4f815acf7 (diff) | |
| download | mongo-e13e069902099d601c6cf64def9fc374082a629e.tar.gz | |
SERVER-38058 Make retryable_writes_direct_write_to_config_transactions.js expect ConflictingOperationInProgress
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/db/session.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/session_catalog.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/session.cpp b/src/mongo/db/session.cpp index 3936dac0478..adbd165c267 100644 --- a/src/mongo/db/session.cpp +++ b/src/mongo/db/session.cpp @@ -45,7 +45,10 @@ OperationContext* Session::currentOperation() const { Session::KillToken Session::kill(WithLock sessionCatalogLock, ErrorCodes::Error reason) { stdx::lock_guard<stdx::mutex> lg(_mutex); - uassert(ErrorCodes::ConflictingOperationInProgress, "Session already killed", !_killRequested); + uassert(ErrorCodes::ConflictingOperationInProgress, + str::stream() << "Session " << getSessionId().getId() + << " is already killed and is in the process of being cleaned up", + !_killRequested); _killRequested = true; // For currently checked-out sessions, interrupt the operation context so that the current owner diff --git a/src/mongo/db/session_catalog.h b/src/mongo/db/session_catalog.h index 90f44b3b60c..8e2a35d8b8d 100644 --- a/src/mongo/db/session_catalog.h +++ b/src/mongo/db/session_catalog.h @@ -251,7 +251,6 @@ class OperationContextSession { public: OperationContextSession(OperationContext* opCtx, bool checkOutSession); - ~OperationContextSession(); /** |