diff options
Diffstat (limited to 'src/mongo/db/s/migration_util.cpp')
-rw-r--r-- | src/mongo/db/s/migration_util.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/mongo/db/s/migration_util.cpp b/src/mongo/db/s/migration_util.cpp index f6affab21bf..fc0f27d564f 100644 --- a/src/mongo/db/s/migration_util.cpp +++ b/src/mongo/db/s/migration_util.cpp @@ -71,11 +71,7 @@ const WriteConcernOptions kMajorityWriteConcern(WriteConcernOptions::kMajority, WriteConcernOptions::kNoTimeout); template <typename Cmd> -void sendToRecipient(OperationContext* opCtx, - const ShardId& recipientId, - const Cmd& cmd, - const LogicalSessionId& lsid, - const TxnNumber txnNumber) { +void sendToRecipient(OperationContext* opCtx, const ShardId& recipientId, const Cmd& cmd) { auto recipientShard = uassertStatusOK(Grid::get(opCtx)->shardRegistry()->getShard(opCtx, recipientId)); @@ -85,9 +81,7 @@ void sendToRecipient(OperationContext* opCtx, opCtx, ReadPreferenceSetting{ReadPreference::PrimaryOnly}, "config", - cmd.toBSON(BSON("lsid" << lsid.toBSON() << "txnNumber" << txnNumber - << WriteConcernOptions::kWriteConcernField - << WriteConcernOptions::Majority)), + cmd.toBSON(BSON(WriteConcernOptions::kWriteConcernField << WriteConcernOptions::Majority)), Shard::RetryPolicy::kIdempotent); uassertStatusOK(Shard::CommandResponse::getEffectiveStatus(response)); @@ -349,15 +343,13 @@ void persistAbortDecision(OperationContext* opCtx, const UUID& migrationId) { void deleteRangeDeletionTaskOnRecipient(OperationContext* opCtx, const ShardId& recipientId, - const UUID& migrationId, - const LogicalSessionId& lsid, - const TxnNumber txnNumber) { + const UUID& migrationId) { write_ops::Delete deleteOp(NamespaceString::kRangeDeletionNamespace); write_ops::DeleteOpEntry query(BSON(RangeDeletionTask::kIdFieldName << migrationId), false /*multi*/); deleteOp.setDeletes({query}); - sendToRecipient(opCtx, recipientId, deleteOp, lsid, txnNumber); + sendToRecipient(opCtx, recipientId, deleteOp); } void deleteRangeDeletionTaskLocally(OperationContext* opCtx, const UUID& deletionTaskId) { @@ -373,9 +365,7 @@ void deleteRangeDeletionTasksForCollectionLocally(OperationContext* opCtx, void markAsReadyRangeDeletionTaskOnRecipient(OperationContext* opCtx, const ShardId& recipientId, - const UUID& migrationId, - const LogicalSessionId& lsid, - const TxnNumber txnNumber) { + const UUID& migrationId) { write_ops::Update updateOp(NamespaceString::kRangeDeletionNamespace); auto queryFilter = BSON(RangeDeletionTask::kIdFieldName << migrationId); auto updateModification = write_ops::UpdateModification( @@ -385,7 +375,7 @@ void markAsReadyRangeDeletionTaskOnRecipient(OperationContext* opCtx, updateEntry.setUpsert(false); updateOp.setUpdates({updateEntry}); - sendToRecipient(opCtx, recipientId, updateOp, lsid, txnNumber); + sendToRecipient(opCtx, recipientId, updateOp); } void markAsReadyRangeDeletionTaskLocally(OperationContext* opCtx, const UUID& migrationId) { |