SERVER-67179 Make 'checkBothEnginesAreRunOnCluster' aware of 'featureFlagSbeFull' (cherry picked from commit e1546a4cf57fc6104a60725839e13efc9e1e3a4d)

1 files changed, 10 insertions, 4 deletions

diff --git a/jstests/libs/sbe_util.js b/jstests/libs/sbe_util.js
index faed62238d9..be6d3509ea7 100644
--- a/jstests/libs/sbe_util.js
+++ b/jstests/libs/sbe_util.js
@@ -106,14 +106,20 @@ function checkBothEnginesAreRunOnCluster(theDB) {
                 const getParam = conn.adminCommand({
                     getParameter: 1,
                     internalQueryForceClassicEngine: 1,
-                    internalQueryEnableSlotBasedExecutionEngine: 1
+                    internalQueryEnableSlotBasedExecutionEngine: 1,
+                    featureFlagSbeFull: 1,
                 });
 
                 if (getParam.hasOwnProperty("internalQueryForceClassicEngine")) {
-                    if (getParam.internalQueryForceClassicEngine) {
-                        engineMap.classic++;
-                    } else {
+                    // We say SBE is fully enabled if the engine is on and either
+                    // 'featureFlagSbeFull' doesn't exist on the targeted server, or it exists and
+                    // is set to true.
+                    if (!getParam.internalQueryForceClassicEngine &&
+                        (!getParam.hasOwnProperty("featureFlagSbeFull") ||
+                         getParam.featureFlagSbeFull.value)) {
                         engineMap.sbe++;
+                    } else {
+                        engineMap.classic++;
                     }
                 }