diff options
| author | Tommaso Tocci <tommaso.tocci@mongodb.com> | 2020-09-16 00:11:16 +0200 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-09-15 23:32:25 +0000 |
| commit | 945ca4f1112f8846e793b40ff47610927b6fc298 (patch) | |
| tree | 809ba4107d38f25570b0688aa99c3b1c171df6f3 /src/mongo/db/s/migration_coordinator.cpp | |
| parent | f9f7f4832d8e94c233e7281790cbeb9b70129382 (diff) | |
| download | mongo-945ca4f1112f8846e793b40ff47610927b6fc298.tar.gz | |
Revert "SERVER-46202 Implement ShardRegistry on top of ReadThroughCache"
This reverts commit a8913858697363a26b06996f0821045b550bea27.
Diffstat (limited to 'src/mongo/db/s/migration_coordinator.cpp')
| -rw-r--r-- | src/mongo/db/s/migration_coordinator.cpp | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/src/mongo/db/s/migration_coordinator.cpp b/src/mongo/db/s/migration_coordinator.cpp index d72311a3369..22102845062 100644 --- a/src/mongo/db/s/migration_coordinator.cpp +++ b/src/mongo/db/s/migration_coordinator.cpp @@ -235,32 +235,21 @@ void MigrationCoordinator::_abortMigrationOnDonorAndRecipient(OperationContext* 23899, 2, "Making abort decision durable", "migrationId"_attr = _migrationInfo.getId()); migrationutil::persistAbortDecision(opCtx, _migrationInfo.getId()); - try { - LOGV2_DEBUG(23900, - 2, - "Bumping transaction number with lsid {lsid} and current txnNumber " - "{currentTxnNumber} on " - "recipient shard {recipientShardId} for abort of collection {nss}", - "Bumping transaction number on recipient shard for abort", - "namespace"_attr = _migrationInfo.getNss(), - "recipientShardId"_attr = _migrationInfo.getRecipientShardId(), - "lsid"_attr = _migrationInfo.getLsid(), - "currentTxnNumber"_attr = _migrationInfo.getTxnNumber(), - "migrationId"_attr = _migrationInfo.getId()); - migrationutil::advanceTransactionOnRecipient(opCtx, - _migrationInfo.getRecipientShardId(), - _migrationInfo.getLsid(), - _migrationInfo.getTxnNumber()); - } catch (const ExceptionFor<ErrorCodes::ShardNotFound>& exShardNotFound) { - LOGV2_DEBUG(4620231, - 1, - "Failed to advance transaction number on recipient shard for abort", - "namespace"_attr = _migrationInfo.getNss(), - "migrationId"_attr = _migrationInfo.getId(), - "recipientShardId"_attr = _migrationInfo.getRecipientShardId(), - "currentTxnNumber"_attr = _migrationInfo.getTxnNumber(), - "error"_attr = exShardNotFound); - } + LOGV2_DEBUG( + 23900, + 2, + "Bumping transaction number with lsid {lsid} and current txnNumber {currentTxnNumber} on " + "recipient shard {recipientShardId} for abort of collection {nss}", + "Bumping transaction number on recipient shard for abort", + "namespace"_attr = _migrationInfo.getNss(), + "recipientShardId"_attr = _migrationInfo.getRecipientShardId(), + "lsid"_attr = _migrationInfo.getLsid(), + "currentTxnNumber"_attr = _migrationInfo.getTxnNumber(), + "migrationId"_attr = _migrationInfo.getId()); + migrationutil::advanceTransactionOnRecipient(opCtx, + _migrationInfo.getRecipientShardId(), + _migrationInfo.getLsid(), + _migrationInfo.getTxnNumber()); hangBeforeSendingAbortDecision.pauseWhileSet(); |