diff options
author | Ian Whalen <ian.whalen@gmail.com> | 2016-07-27 14:07:59 -0400 |
---|---|---|
committer | Ian Whalen <ian.whalen@gmail.com> | 2016-07-27 14:07:59 -0400 |
commit | 1c1bf24edf54e41e541cf91a06b38d2056400179 (patch) | |
tree | 9629e1046faff0b9b093688a70d6a834c8b3efb8 /src/mongo/db/s/migration_destination_manager_legacy_commands.cpp | |
parent | b0be62ef611373f426af8be77dd3af4457598a20 (diff) | |
download | mongo-1c1bf24edf54e41e541cf91a06b38d2056400179.tar.gz |
Revert "SERVER-24856 Make manual moveChunk requests go through the balancer on CSRS primary"
This reverts commit 22eff747e1e2408cb30f286751c47965e909c5b1.
Diffstat (limited to 'src/mongo/db/s/migration_destination_manager_legacy_commands.cpp')
-rw-r--r-- | src/mongo/db/s/migration_destination_manager_legacy_commands.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp b/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp index 6c528147df9..545925f7190 100644 --- a/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp +++ b/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp @@ -95,9 +95,10 @@ public: // Active state of TO-side migrations (MigrateStatus) is serialized by distributed // collection lock. - uassert(ErrorCodes::ConflictingOperationInProgress, - "Shard is already serving as a destination for migration", - !shardingState->migrationDestinationManager()->isActive()); + if (shardingState->migrationDestinationManager()->isActive()) { + errmsg = "migrate already in progress"; + return false; + } // Pending deletes (for migrations) are serialized by the distributed collection lock, // we are sure we registered a delete for a range *before* we can migrate-in a |