summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2020-01-09 16:20:10 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-05 19:31:07 +0000
commitc51a36a187405c0d56698a6a3242b8828e387c37 (patch)
tree98e1f8a4425d727ce924b038082af151643fc859 /buildscripts
parent746549116acd3139e64520159e8542387edce0b1 (diff)
downloadmongo-c51a36a187405c0d56698a6a3242b8828e387c37.tar.gz
SERVER-42191 Add a new test hook that checks that all orphaned documents are eventually deleted
create mode 100644 jstests/libs/override_methods/check_orphans_are_deleted.js
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion_auth.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_multiversion.yml2
-rw-r--r--buildscripts/resmokelib/core/programs.py3
6 files changed, 15 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index eb8b8e458cd..88efab7d5a2 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -23,3 +23,7 @@ executor:
config:
shell_options:
nodb: ''
+ global_vars:
+ TestData:
+ # TODO: SERVER-45959 remove after v4.4
+ skipCheckOrphans: true
diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
index 2dfeaa609bd..df662863282 100644
--- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
@@ -33,6 +33,8 @@ executor:
authMechanism: SCRAM-SHA-1
keyFile: *keyFile
keyFileData: *keyFileData
+ # TODO: SERVER-45959 remove after v4.4
+ skipCheckOrphans: true
authenticationDatabase: local
authenticationMechanism: SCRAM-SHA-1
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
index 6d5b596da65..c63b20551fe 100644
--- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
@@ -218,7 +218,9 @@ executor:
shell_options:
global_vars:
TestData:
+ # TODO: SERVER-45994 remove
skipCheckingCatalogCacheConsistencyWithShardingCatalog: true
+ skipCheckOrphans: true
eval: "load('jstests/libs/override_methods/sharding_continuous_config_stepdown.js');"
nodb: ''
readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index 1b8f00e0984..28ae7ed1343 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -36,4 +36,6 @@ executor:
mongosBinVersion: 'last-stable'
shardMixedBinVersions: true
skipCheckingUUIDsConsistentAcrossCluster: true
+ # TODO: SERVER-45959 remove after v4.4
+ skipCheckOrphans: true
nodb: ''
diff --git a/buildscripts/resmokeconfig/suites/sharding_multiversion.yml b/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
index b12aecbecd5..a84a90efa19 100644
--- a/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
@@ -15,3 +15,5 @@ executor:
TestData:
useRandomBinVersionsWithinReplicaSet: true
mongosBinVersion: 'last-stable'
+ # TODO: SERVER-45959 remove after v4.4
+ skipCheckOrphans: true
diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py
index 78c67534a30..a63dd1952ce 100644
--- a/buildscripts/resmokelib/core/programs.py
+++ b/buildscripts/resmokelib/core/programs.py
@@ -339,6 +339,9 @@ def mongo_shell_program( # pylint: disable=too-many-branches,too-many-locals,to
eval_sb.append(
"load('jstests/libs/override_methods/check_indexes_consistent_across_cluster.js');")
+ # Load a callback to check that all orphans are deleted before shutting down a ShardingTest.
+ eval_sb.append("load('jstests/libs/override_methods/check_orphans_are_deleted.js');")
+
# Load this file to retry operations that fail due to in-progress background operations.
eval_sb.append(
"load('jstests/libs/override_methods/implicitly_retry_on_background_op_in_progress.js');")