SERVER-27599 replace unpredictable unordered config.shards queries with shard accesses through ShardingTest

1 files changed, 7 insertions, 10 deletions

diff --git a/jstests/sharding/coll_epoch_test1.js b/jstests/sharding/coll_epoch_test1.js
index 2cc7c26c60b..2203bed6641 100644
--- a/jstests/sharding/coll_epoch_test1.js
+++ b/jstests/sharding/coll_epoch_test1.js
@@ -14,10 +14,7 @@
     var staleMongos = st.s1;
     var insertMongos = st.s2;
 
-    var shards = [];
-    config.shards.find().forEach(function(doc) {
-        shards.push(doc._id);
-    });
+    var shards = [st.shard0, st.shard1, st.shard2];
 
     //
     // Test that inserts and queries go to the correct shard even when the collection has been
@@ -29,7 +26,7 @@
     assert.commandWorked(admin.runCommand({enableSharding: coll.getDB() + ""}));
     // TODO(PM-85): Make sure we *always* move the primary after collection lifecyle project is
     // complete
-    st.ensurePrimaryShard(coll.getDB().getName(), 'shard0001');
+    st.ensurePrimaryShard(coll.getDB().getName(), st.shard1.shardName);
     assert.commandWorked(admin.runCommand({shardCollection: coll + "", key: {_id: 1}}));
     st.configRS.awaitLastOpCommitted();  // TODO: Remove after collection lifecyle project (PM-85)
 
@@ -49,7 +46,7 @@
 
     jsTest.log("Re-enabling sharding with a different key...");
 
-    st.ensurePrimaryShard(coll.getDB().getName(), 'shard0001');
+    st.ensurePrimaryShard(coll.getDB().getName(), st.shard1.shardName);
     assert.commandWorked(coll.ensureIndex({notId: 1}));
     assert.commandWorked(admin.runCommand({shardCollection: coll + "", key: {notId: 1}}));
 
@@ -88,10 +85,10 @@
 
     jsTest.log("Re-creating sharded collection with different primary...");
 
-    var getOtherShard = function(shard) {
-        for (var id in shards) {
-            if (shards[id] != shard)
-                return shards[id];
+    var getOtherShard = function(shardId) {
+        for (var i = 0; i < shards.length; ++i) {
+            if (shards[i].shardName != shardId)
+                return shards[i].shardName;
         }
     };