SERVER-37647 Validation hook sets FCV to 3.4 no matter what version it currently is

1 files changed, 7 insertions, 6 deletions

diff --git a/jstests/hooks/run_validate_collections.js b/jstests/hooks/run_validate_collections.js
index e0292740b97..55fc6a02ab3 100644
--- a/jstests/hooks/run_validate_collections.js
+++ b/jstests/hooks/run_validate_collections.js
@@ -108,12 +108,13 @@
             }
         }
 
-        if (originalFCV !== jsTest.options().forceValidationWithFeatureCompatibilityVersion) {
-            assert.commandWorked(adminDB.adminCommand({
-                setFeatureCompatibilityVersion:
-                    jsTest.options().forceValidationWithFeatureCompatibilityVersion
-            }));
-        }
+        // The sharded cluster could be in a state where the config servers are in FCV 3.4 but the
+        // shard servers are in FCV 3.2.  Therefore, we set the FCV to
+        // forceValidationWithFeatureCompatibilityVersion even if it is the same as originalFCV.
+        assert.commandWorked(adminDB.adminCommand({
+            setFeatureCompatibilityVersion:
+                jsTest.options().forceValidationWithFeatureCompatibilityVersion
+        }));
     }
 
     try {