SERVER-50635 Retry index consistency check at ShardingTest shutdown on ShardNotFound errors

1 files changed, 15 insertions, 1 deletions

diff --git a/jstests/libs/override_methods/check_indexes_consistent_across_cluster.js b/jstests/libs/override_methods/check_indexes_consistent_across_cluster.js
index 61f7603f4c5..d30673b0c5a 100644
--- a/jstests/libs/override_methods/check_indexes_consistent_across_cluster.js
+++ b/jstests/libs/override_methods/check_indexes_consistent_across_cluster.js
@@ -39,7 +39,21 @@ ShardingTest.prototype.checkIndexesConsistentAcrossCluster = function() {
      */
     function makeGetIndexDocsFunc(ns) {
         return () => {
-            return ShardedIndexUtil.getPerShardIndexes(mongos.getCollection(ns));
+            while (true) {
+                try {
+                    return ShardedIndexUtil.getPerShardIndexes(mongos.getCollection(ns));
+                } catch (e) {
+                    // Getting the indexes can fail with ShardNotFound if the router's ShardRegistry
+                    // reloads after choosing which shards to target and a chosen shard is no longer
+                    // in the cluster. This error should be transient, so it can be retried on.
+                    if (e.code === ErrorCodes.ShardNotFound) {
+                        print("Retrying $indexStats aggregation on ShardNotFound error: " +
+                              tojson(e));
+                        continue;
+                    }
+                    throw e;
+                }
+            }
         };
     }