SERVER-31934 set orphanCleanupDelaySecs=1 for all tests

(cherry picked from commit a094c5b4b4783895d5fe168541bd97103a0d05f5)

5 files changed, 12 insertions, 31 deletions

diff --git a/jstests/concurrency/fsm_all_sharded_causal_consistency.js b/jstests/concurrency/fsm_all_sharded_causal_consistency.js
index 8b5a8208592..742c3e2b5bd 100644
--- a/jstests/concurrency/fsm_all_sharded_causal_consistency.js
+++ b/jstests/concurrency/fsm_all_sharded_causal_consistency.js
@@ -95,18 +95,7 @@ var blacklist = [
     'yield_and_hashed.js',  // stagedebug can only be run against a standalone mongod
     'yield_and_sorted.js',  // stagedebug can only be run against a standalone mongod
 
-    'reindex_background.js',  // TODO SERVER-30983
-
-    'agg_base.js',  // TODO SERVER-30984
-
-    'indexed_insert_multikey.js',                         // TODO SERVER-31000
-    'indexed_insert_multikey_noindex.js',                 // TODO SERVER-31000
-    'indexed_insert_text_multikey.js',                    // TODO SERVER-31000
-    'update_multifield_multiupdate.js',                   // TODO SERVER-31000
-    'update_multifield_multiupdate_noindex.js',           // TODO SERVER-31000
-    'update_multifield_isolated_multiupdate.js',          // TODO SERVER-31000
-    'update_multifield_isolated_multiupdate_noindex.js',  // TODO SERVER-31000
-    'yield_id_hack.js',                                   // TODO SERVER-31000
+    'reindex_background.js'  // TODO SERVER-30983
 ].map(function(file) {
     return dir + '/' + file;
 });
diff --git a/jstests/concurrency/fsm_all_sharded_causal_consistency_and_balancer.js b/jstests/concurrency/fsm_all_sharded_causal_consistency_and_balancer.js
index 66a109e1c21..03ce5bda7fd 100644
--- a/jstests/concurrency/fsm_all_sharded_causal_consistency_and_balancer.js
+++ b/jstests/concurrency/fsm_all_sharded_causal_consistency_and_balancer.js
@@ -101,18 +101,7 @@ var blacklist = [
     'yield_and_hashed.js',  // stagedebug can only be run against a standalone mongod
     'yield_and_sorted.js',  // stagedebug can only be run against a standalone mongod
 
-    'reindex_background.js',  // TODO SERVER-30983
-
-    'agg_base.js',  // TODO SERVER-30984
-
-    'indexed_insert_multikey.js',                         // TODO SERVER-31000
-    'indexed_insert_multikey_noindex.js',                 // TODO SERVER-31000
-    'indexed_insert_text_multikey.js',                    // TODO SERVER-31000
-    'update_multifield_multiupdate.js',                   // TODO SERVER-31000
-    'update_multifield_multiupdate_noindex.js',           // TODO SERVER-31000
-    'update_multifield_isolated_multiupdate.js',          // TODO SERVER-31000
-    'update_multifield_isolated_multiupdate_noindex.js',  // TODO SERVER-31000
-    'yield_id_hack.js',                                   // TODO SERVER-31000
+    'reindex_background.js'  // TODO SERVER-30983
 ].map(function(file) {
     return dir + '/' + file;
 });
diff --git a/jstests/sharding/no_empty_reset.js b/jstests/sharding/no_empty_reset.js
index 8120ab889ee..5b7d9b49e4c 100644
--- a/jstests/sharding/no_empty_reset.js
+++ b/jstests/sharding/no_empty_reset.js
@@ -2,15 +2,12 @@
 
 var st = new ShardingTest({shards: 2, mongos: 2});
 
-// Don't balance since we're manually moving chunks
-st.stopBalancer();
-
 var coll = st.s.getCollection(jsTestName() + ".coll");
 
 for (var i = -10; i < 10; i++)
     coll.insert({_id: i});
 
-st.shardColl(coll, {_id: 1}, {_id: 0});
+st.shardColl(coll, {_id: 1}, {_id: 0}, {_id: 0}, null, /* waitForDelete */ true);
 
 jsTestLog("Sharded setup complete");
 
diff --git a/jstests/sharding/recovering_slaveok.js b/jstests/sharding/recovering_slaveok.js
index 8287cdd3e14..58cb31ba09d 100644
--- a/jstests/sharding/recovering_slaveok.js
+++ b/jstests/sharding/recovering_slaveok.js
@@ -20,7 +20,8 @@
     var admin = mongos.getDB("admin");
     var config = mongos.getDB("config");
 
-    var dbase = mongos.getDB("test");
+    const dbName = "test";
+    var dbase = mongos.getDB(dbName);
     var coll = dbase.getCollection("foo");
     var dbaseSOk = mongosSOK.getDB("" + dbase);
     var collSOk = mongosSOK.getCollection("" + coll);
@@ -41,7 +42,12 @@
 
     print("2: shard collection");
 
-    shardTest.shardColl(coll, /* shardBy */ {_id: 1}, /* splitAt */ {_id: 0});
+    shardTest.shardColl(coll,
+                        /* shardBy */ {_id: 1},
+                        /* splitAt */ {_id: 0},
+                        /* move chunk */ {_id: 0},
+                        /* dbname */ null,
+                        /* waitForDelete */ true);
 
     print("3: test normal and slaveOk queries");
 
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 68bd1810da9..dd9c82c916c 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -1091,7 +1091,7 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
                         }
                     }
                     if (!hasParam) {
-                        argArray.push(...['--setParameter', 'orphanCleanupDelaySecs=0']);
+                        argArray.push(...['--setParameter', 'orphanCleanupDelaySecs=1']);
                     }
                 }