SERVER-55623 Fix covered shard filtering on hashed indexes in SBE

2 files changed, 25 insertions, 4 deletions

diff --git a/jstests/core/idhack.js b/jstests/core/idhack.js
index 3a022a1c823..bdfe4d4da08 100644
--- a/jstests/core/idhack.js
+++ b/jstests/core/idhack.js
@@ -12,11 +12,9 @@ t.drop();
 // Include helpers for analyzing explain output.
 load("jstests/libs/analyze_plan.js");
 load("jstests/libs/sbe_explain_helpers.js");
+load("jstests/libs/sbe_util.js");
 
-const isSBEEnabled = (() => {
-    const getParam = db.adminCommand({getParameter: 1, featureFlagSBE: 1});
-    return getParam.hasOwnProperty("featureFlagSBE") && getParam.featureFlagSBE.value;
-})();
+const isSBEEnabled = checkSBEEnabled(db);
 
 assert.commandWorked(t.insert({_id: {x: 1}, z: 1}));
 assert.commandWorked(t.insert({_id: {x: 2}, z: 2}));
diff --git a/jstests/libs/sbe_util.js b/jstests/libs/sbe_util.js
new file mode 100644
index 00000000000..669b29661f9
--- /dev/null
+++ b/jstests/libs/sbe_util.js
@@ -0,0 +1,23 @@
+/*
+ * Utilities for checking whether SBE is enabled.
+ */
+
+load("jstests/libs/discover_topology.js");  // For findNonConfigNodes.
+load("jstests/libs/fixture_helpers.js");    // For 'isMongos'
+
+function checkSBEEnabled(theDB) {
+    const nodes = DiscoverTopology.findNonConfigNodes(theDB.getMongo());
+
+    for (const node of nodes) {
+        // Find a non-mongos node and check whether its SBE feature flag is on. We assume either
+        // all nodes in the cluster have SBE on or none.
+        const conn = new Mongo(nodes[0]);
+        if (FixtureHelpers.isMongos(conn.getDB("admin"))) {
+            continue;
+        }
+
+        const getParam = conn.adminCommand({getParameter: 1, featureFlagSBE: 1});
+        return getParam.hasOwnProperty("featureFlagSBE") && getParam.featureFlagSBE.value;
+    }
+    assert(false, "Couldn't find mongod");
+}