Revert "SERVER-24856 Make manual moveChunk requests go through the balancer on CSRS primary"

This reverts commit 22eff747e1e2408cb30f286751c47965e909c5b1.

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