diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-11-13 15:45:49 +0100 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-11-13 15:45:49 +0100 |
| commit | 6fcffde92eecc1d9d9ae819d9380ec4c26f5a04a (patch) | |
| tree | 769820090631e851add00e78123a60ce97d53c79 /src/mongo/db/session.cpp | |
| parent | 2f640ed748b861a242b3ad153e821f6b459b2511 (diff) | |
| download | mongo-6fcffde92eecc1d9d9ae819d9380ec4c26f5a04a.tar.gz | |
Revert "SERVER-38058 Make retryable_writes_direct_write_to_config_transactions.js expect ConflictingOperationInProgress"
This reverts commit 2f640ed748b861a242b3ad153e821f6b459b2511.
Diffstat (limited to 'src/mongo/db/session.cpp')
| -rw-r--r-- | src/mongo/db/session.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mongo/db/session.cpp b/src/mongo/db/session.cpp index adbd165c267..3936dac0478 100644 --- a/src/mongo/db/session.cpp +++ b/src/mongo/db/session.cpp @@ -45,10 +45,7 @@ OperationContext* Session::currentOperation() const { Session::KillToken Session::kill(WithLock sessionCatalogLock, ErrorCodes::Error reason) { stdx::lock_guard<stdx::mutex> lg(_mutex); - uassert(ErrorCodes::ConflictingOperationInProgress, - str::stream() << "Session " << getSessionId().getId() - << " is already killed and is in the process of being cleaned up", - !_killRequested); + uassert(ErrorCodes::ConflictingOperationInProgress, "Session already killed", !_killRequested); _killRequested = true; // For currently checked-out sessions, interrupt the operation context so that the current owner |