SERVER-57759 Run movePrimary command before sharding the source collection in the ReshardingTest fixture

1 files changed, 9 insertions, 7 deletions

diff --git a/jstests/sharding/libs/resharding_test_fixture.js b/jstests/sharding/libs/resharding_test_fixture.js
index 5bfde1c09b1..99d115d414d 100644
--- a/jstests/sharding/libs/resharding_test_fixture.js
+++ b/jstests/sharding/libs/resharding_test_fixture.js
@@ -183,6 +183,15 @@ var ReshardingTest = class {
         const sourceCollection = this._st.s.getCollection(ns);
         const sourceDB = sourceCollection.getDB();
 
+        assert.commandWorked(sourceDB.adminCommand({enableSharding: sourceDB.getName()}));
+
+        // mongos won't know about the temporary resharding collection and will therefore assume the
+        // collection is unsharded. We configure one of the recipient shards to be the primary shard
+        // for the database so mongos still ends up routing operations to a shard which owns the
+        // temporary resharding collection.
+        this._st.ensurePrimaryShard(sourceDB.getName(), primaryShardName);
+        this._primaryShardName = primaryShardName;
+
         CreateShardedCollectionUtil.shardCollectionWithChunks(
             sourceCollection, shardKeyPattern, chunks);
 
@@ -192,13 +201,6 @@ var ReshardingTest = class {
 
         this._tempNs = `${sourceDB.getName()}.system.resharding.${sourceCollectionUUIDString}`;
 
-        // mongos won't know about the temporary resharding collection and will therefore assume the
-        // collection is unsharded. We configure one of the recipient shards to be the primary shard
-        // for the database so mongos still ends up routing operations to a shard which owns the
-        // temporary resharding collection.
-        this._st.ensurePrimaryShard(sourceDB.getName(), primaryShardName);
-        this._primaryShardName = primaryShardName;
-
         return sourceCollection;
     }