diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2020-08-07 06:16:48 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-07 19:48:44 +0000 |
| commit | 2931f3c764f8e093ae31adb4b2b62c1ce01d7421 (patch) | |
| tree | 77c8f40a0db32708f106b6498e9479dc650037af /src/mongo/db/s/migration_coordinator.cpp | |
| parent | f72268197eb8845b11ea24dcf458db4a0c463034 (diff) | |
| download | mongo-2931f3c764f8e093ae31adb4b2b62c1ce01d7421.tar.gz | |
SERVER-50174 Make MigrationCoordinator recovery acquire the MigrationBlockingGuard
Diffstat (limited to 'src/mongo/db/s/migration_coordinator.cpp')
| -rw-r--r-- | src/mongo/db/s/migration_coordinator.cpp | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/mongo/db/s/migration_coordinator.cpp b/src/mongo/db/s/migration_coordinator.cpp index a4fe84afb6d..22102845062 100644 --- a/src/mongo/db/s/migration_coordinator.cpp +++ b/src/mongo/db/s/migration_coordinator.cpp @@ -182,15 +182,17 @@ SemiFuture<void> MigrationCoordinator::_commitMigrationOnDonorAndRecipient( 23894, 2, "Making commit decision durable", "migrationId"_attr = _migrationInfo.getId()); migrationutil::persistCommitDecision(opCtx, _migrationInfo.getId()); - LOGV2_DEBUG(23895, - 2, - "Bumping transaction number with lsid {lsid} and current txnNumber " - "{currentTxnNumber} on recipient shard {recipientShardId}", - "Bumping transaction number on recipient shard", - "recipientShardId"_attr = _migrationInfo.getRecipientShardId(), - "lsid"_attr = _migrationInfo.getLsid().toBSON(), - "currentTxnNumber"_attr = _migrationInfo.getTxnNumber(), - "migrationId"_attr = _migrationInfo.getId()); + LOGV2_DEBUG( + 23895, + 2, + "Bumping transaction number with lsid {lsid} and current txnNumber {currentTxnNumber} on " + "recipient shard {recipientShardId} for commit of collection {nss}", + "Bumping transaction number on recipient shard for commit", + "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(), @@ -233,15 +235,17 @@ void MigrationCoordinator::_abortMigrationOnDonorAndRecipient(OperationContext* 23899, 2, "Making abort decision durable", "migrationId"_attr = _migrationInfo.getId()); migrationutil::persistAbortDecision(opCtx, _migrationInfo.getId()); - LOGV2_DEBUG(23900, - 2, - "Bumping transaction number with lsid {lsid} and current txnNumber " - "{currentTxnNumber} on recipient shard {recipientShardId}", - "Bumping transaction number on recipient shard", - "recipientShardId"_attr = _migrationInfo.getRecipientShardId(), - "lsid"_attr = _migrationInfo.getLsid().toBSON(), - "currentTxnNumber"_attr = _migrationInfo.getTxnNumber(), - "migrationId"_attr = _migrationInfo.getId()); + 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(), |