SERVER-34178 Wire up TestData.excludedDBsFromDBHash again.

Also removes the exclusion from all of the fuzzer test suites.

(cherry picked from commit 788a26e18135321927bbe0b2bdbff12efc467954)

8 files changed, 11 insertions, 13 deletions

diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml
index 819d439fcbd..20be1cbd5c3 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml
@@ -17,8 +17,6 @@ executor:
     shell_options:
       global_vars:
         TestData:
-          excludedDBsFromDBHash:
-            - config
           skipValidationOnInvalidViewDefinitions: true
   - class: ValidateCollections
     shell_options:
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_replication_session.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_replication_session.yml
index 3fc68473d6e..01a028809f3 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_replication_session.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_replication_session.yml
@@ -18,8 +18,6 @@ executor:
     shell_options:
       global_vars:
         TestData:
-          excludedDBsFromDBHash:
-            - config
           skipValidationOnInvalidViewDefinitions: true
   - class: ValidateCollections
     shell_options:
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml
index 6e05ef1a41f..860fda0a742 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml
@@ -13,8 +13,6 @@ executor:
     shell_options:
       global_vars:
         TestData:
-          excludedDBsFromDBHash:
-            - config
           skipValidationOnInvalidViewDefinitions: true
   - class: ValidateCollections
     shell_options:
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_causal_consistency.yml
index 394f8f8c33a..1534e41dada 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_causal_consistency.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_causal_consistency.yml
@@ -18,8 +18,6 @@ executor:
     shell_options:
       global_vars:
         TestData:
-          excludedDBsFromDBHash:
-            - config
           skipValidationOnInvalidViewDefinitions: true
   - class: ValidateCollections
     shell_options:
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_continuous_stepdown.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_continuous_stepdown.yml
index 4bc702911a1..0af49c171b6 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_continuous_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_continuous_stepdown.yml
@@ -22,6 +22,11 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
+  - class: CheckReplDBHash
+    shell_options:
+      global_vars:
+        TestData:
+          skipValidationOnInvalidViewDefinitions: true
   fixture:
     class: ShardedClusterFixture
     mongos_options:
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml
index 2b67d857838..55edf303875 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml
@@ -14,8 +14,6 @@ executor:
     shell_options:
       global_vars:
         TestData:
-          excludedDBsFromDBHash:
-            - config
           skipValidationOnInvalidViewDefinitions: true
   - class: ValidateCollections
     shell_options:
diff --git a/jstests/hooks/run_check_repl_dbhash.js b/jstests/hooks/run_check_repl_dbhash.js
index 3f724aec894..c747330a7b3 100644
--- a/jstests/hooks/run_check_repl_dbhash.js
+++ b/jstests/hooks/run_check_repl_dbhash.js
@@ -101,7 +101,8 @@
     function checkReplicatedDataHashesThread(hosts, testData) {
         try {
             TestData = testData;
-            new ReplSetTest(hosts[0]).checkReplicatedDataHashes();
+            const excludedDBs = jsTest.options().excludedDBsFromDBHash;
+            new ReplSetTest(hosts[0]).checkReplicatedDataHashes(undefined, excludedDBs);
             return {ok: 1};
         } catch (e) {
             return {ok: 0, hosts: hosts, error: e.toString(), stack: e.stack};
@@ -137,7 +138,8 @@
                 return;
             }
 
-            new ReplSetTest(topology.nodes[0]).checkReplicatedDataHashes();
+            const excludedDBs = jsTest.options().excludedDBsFromDBHash;
+            new ReplSetTest(topology.nodes[0]).checkReplicatedDataHashes(undefined, excludedDBs);
             return;
         }
 
diff --git a/jstests/hooks/run_initial_sync_node_validation.js b/jstests/hooks/run_initial_sync_node_validation.js
index 769409c534d..562f3f00076 100644
--- a/jstests/hooks/run_initial_sync_node_validation.js
+++ b/jstests/hooks/run_initial_sync_node_validation.js
@@ -42,7 +42,8 @@
        to ensure we're validating the entire contents of the collection */
 
     // For checkDBHashes
-    rst.checkReplicatedDataHashes();
+    const excludedDBs = jsTest.options().excludedDBsFromDBHash;
+    rst.checkReplicatedDataHashes(undefined, excludedDBs);
 
     load('jstests/hooks/run_validate_collections.js');