SERVER-55973: resharding_disallow_drop.js is not waiting for resharding to acquire distLocks before attempting to drop the collection

1 files changed, 5 insertions, 9 deletions

diff --git a/jstests/sharding/resharding_disallow_drop.js b/jstests/sharding/resharding_disallow_drop.js
index e6924195496..2404f7673e0 100644
--- a/jstests/sharding/resharding_disallow_drop.js
+++ b/jstests/sharding/resharding_disallow_drop.js
@@ -11,17 +11,13 @@
 load("jstests/libs/fail_point_util.js");
 load('jstests/libs/parallel_shell_helpers.js');
 
+// Ensures that resharding has acquired the db and collection distLocks. The fact that the entry in
+// config.reshardingOperations exists guarantees that the distLocks have already been acquired.
 function awaitReshardingStarted() {
     assert.soon(() => {
-        const op = st.admin
-                       .aggregate([
-                           {$currentOp: {allUsers: true, localOps: true}},
-                           {$match: {"command.reshardCollection": ns}},
-                       ])
-                       .toArray()[0];
-
-        return op !== undefined;
-    }, "failed to find reshardCollection in $currentOp output");
+        const coordinatorDoc = st.s.getCollection("config.reshardingOperations").findOne({ns: ns});
+        return coordinatorDoc !== null;
+    }, "resharding didn't start");
 }
 
 var st = new ShardingTest({