diff options
author | Jack Mulrow <jack.mulrow@mongodb.com> | 2021-05-05 16:06:16 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-06 20:26:20 +0000 |
commit | 2cd5c5110d837a2de0dd197f805531b5b409f2a2 (patch) | |
tree | bf0d283dcec37e95aff04d45e3082b3a8315f463 /src/mongo | |
parent | ac3a335935e916b906a203b66c773222c6f2bc61 (diff) | |
download | mongo-2cd5c5110d837a2de0dd197f805531b5b409f2a2.tar.gz |
SERVER-56686 Don't return tenant migration details to users in errors
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/db/repl/tenant_migration_access_blocker_util.cpp | 45 | ||||
-rw-r--r-- | src/mongo/db/repl/tenant_migration_donor_access_blocker.cpp | 3 |
2 files changed, 19 insertions, 29 deletions
diff --git a/src/mongo/db/repl/tenant_migration_access_blocker_util.cpp b/src/mongo/db/repl/tenant_migration_access_blocker_util.cpp index 798b8183fad..7184c018a6a 100644 --- a/src/mongo/db/repl/tenant_migration_access_blocker_util.cpp +++ b/src/mongo/db/repl/tenant_migration_access_blocker_util.cpp @@ -207,35 +207,26 @@ SemiFuture<void> checkIfCanReadOrBlock(OperationContext* opCtx, const OpMsgReque } return donorMtabStatus; }) - .onError<ErrorCodes::CallbackCanceled>([cancelTimeoutSource, - cancelCanReadSource, - donorMtab, - recipientMtab, - timeoutError = opCtx->getTimeoutError()]( - Status status) mutable { - auto isCanceledDueToTimeout = cancelTimeoutSource.token().isCanceled(); - - if (!isCanceledDueToTimeout) { - cancelTimeoutSource.cancel(); - } - - // At least one of 'donorMtab' or 'recipientMtab' must exist if we were canceled here. - BSONObj info = donorMtab ? donorMtab->getDebugInfo() : recipientMtab->getDebugInfo(); - if (recipientMtab) { - info = - info.addField(recipientMtab->getDebugInfo().getField("donorConnectionString")); - } + .onError<ErrorCodes::CallbackCanceled>( + [cancelTimeoutSource, + cancelCanReadSource, + donorMtab, + recipientMtab, + timeoutError = opCtx->getTimeoutError()](Status status) mutable { + auto isCanceledDueToTimeout = cancelTimeoutSource.token().isCanceled(); + + if (!isCanceledDueToTimeout) { + cancelTimeoutSource.cancel(); + } - if (isCanceledDueToTimeout) { - return Status( - timeoutError, - "Blocked read timed out waiting for tenant migration to commit or abort", - info); - } + if (isCanceledDueToTimeout) { + return Status( + timeoutError, + "Blocked read timed out waiting for tenant migration to commit or abort"); + } - return status.withContext(str::stream() << "Canceled read blocked by tenant migration " - << info.toString()); - }) + return status.withContext("Canceled read blocked by tenant migration"); + }) .semi(); // To require continuation in the user executor. } diff --git a/src/mongo/db/repl/tenant_migration_donor_access_blocker.cpp b/src/mongo/db/repl/tenant_migration_donor_access_blocker.cpp index f280a6650be..248fab51faa 100644 --- a/src/mongo/db/repl/tenant_migration_donor_access_blocker.cpp +++ b/src/mongo/db/repl/tenant_migration_donor_access_blocker.cpp @@ -128,8 +128,7 @@ Status TenantMigrationDonorAccessBlocker::waitUntilCommittedOrAborted(OperationC } else if (idx == 1) { // Deadline finished first, return error return Status(opCtx->getTimeoutError(), - "Operation timed out waiting for tenant migration to commit or abort", - getDebugInfo()); + "Operation timed out waiting for tenant migration to commit or abort"); } MONGO_UNREACHABLE; } |