diff options
author | Kevin Albertson <kevin.albertson@10gen.com> | 2018-02-08 09:46:57 -0500 |
---|---|---|
committer | Kevin Albertson <kevin.albertson@10gen.com> | 2018-02-08 09:46:57 -0500 |
commit | c556e377094792e7253a95cb5fedcd703a99bf2c (patch) | |
tree | b2032e22b5ab1ef21927f2483578cb11df3c341d /jstests/sharding | |
parent | e1fdc072a60a0cc47395e09c3d9a796f424e0040 (diff) | |
download | mongo-c556e377094792e7253a95cb5fedcd703a99bf2c.tar.gz |
SERVER-25640 terminate running processes in jstests
Diffstat (limited to 'jstests/sharding')
59 files changed, 74 insertions, 4 deletions
diff --git a/jstests/sharding/addshard2.js b/jstests/sharding/addshard2.js index e0fce8864ec..cb61d4b4245 100644 --- a/jstests/sharding/addshard2.js +++ b/jstests/sharding/addshard2.js @@ -194,5 +194,6 @@ rst5.stopSet(); st.stop(); + MongoRunner.stopMongod(normalShard); })(); diff --git a/jstests/sharding/addshard4.js b/jstests/sharding/addshard4.js index de2c8a17c10..4d4ee82975d 100644 --- a/jstests/sharding/addshard4.js +++ b/jstests/sharding/addshard4.js @@ -36,6 +36,7 @@ printjson(result); assert.eq(result, true); + r.stopSet(); r = new ReplSetTest({name: "addshard42", nodes: 3}); r.startSet(); @@ -57,5 +58,6 @@ assert.eq(result, true); s.stop(); + r.stopSet(); })(); diff --git a/jstests/sharding/addshard5.js b/jstests/sharding/addshard5.js index 128c52252a1..f2e6068d023 100644 --- a/jstests/sharding/addshard5.js +++ b/jstests/sharding/addshard5.js @@ -42,4 +42,5 @@ assert.eq('world', shard2.getCollection(coll + '').findOne().hello); st.stop(); + MongoRunner.stopMongod(shard2); })(); diff --git a/jstests/sharding/addshard_idempotent.js b/jstests/sharding/addshard_idempotent.js index e0d98e9ea18..796869d2cd0 100644 --- a/jstests/sharding/addshard_idempotent.js +++ b/jstests/sharding/addshard_idempotent.js @@ -50,7 +50,8 @@ assert.eq(shard2.getURL(), shard.host); } } - + MongoRunner.stopMongod(shard1); + shard2.stopSet(); st.stop(); })(); diff --git a/jstests/sharding/after_cluster_time.js b/jstests/sharding/after_cluster_time.js index bc8b1cf462a..2c647b4d423 100644 --- a/jstests/sharding/after_cluster_time.js +++ b/jstests/sharding/after_cluster_time.js @@ -117,5 +117,6 @@ assertAfterClusterTimeReadFailsWithCode( testDB, {level: "majority", afterClusterTime: Timestamp(0, 0)}, ErrorCodes.InvalidOptions); + rst.stopSet(); st.stop(); })(); diff --git a/jstests/sharding/aggregation_currentop.js b/jstests/sharding/aggregation_currentop.js index 2cae3bf11c2..52fc160c22f 100644 --- a/jstests/sharding/aggregation_currentop.js +++ b/jstests/sharding/aggregation_currentop.js @@ -541,6 +541,9 @@ // Test that the allUsers parameter is ignored when authentication is disabled. restartReplSet(shardRS, {shardsvr: null, keyFile: null}); + // Explicitly set the keyFile to null. If ReplSetTest#stopSet sees a keyFile property, it + // attempts to auth before dbhash checks. + shardRS.keyFile = null; // Ensure that there is at least one other connection present. const otherConn = new Mongo(shardConn.host); @@ -623,4 +626,5 @@ assert.commandWorked(shardAdminDB.killOp(op.opid)); awaitShell(); + st.stop(); })(); diff --git a/jstests/sharding/auth.js b/jstests/sharding/auth.js index 155bd44b2dc..45613632e9d 100644 --- a/jstests/sharding/auth.js +++ b/jstests/sharding/auth.js @@ -354,5 +354,6 @@ assert.commandFailed(readOnlyDB.killOp(123)); s.stop(); - + d1.stopSet(); + d2.stopSet(); })(); diff --git a/jstests/sharding/auth_copydb.js b/jstests/sharding/auth_copydb.js index cd807540df1..47bffce9059 100644 --- a/jstests/sharding/auth_copydb.js +++ b/jstests/sharding/auth_copydb.js @@ -41,4 +41,5 @@ assert.eq(1, destTestDB.foo.findOne().a); st.stop(); + MongoRunner.stopMongod(sourceMongodConn); })(); diff --git a/jstests/sharding/auth_no_config_primary.js b/jstests/sharding/auth_no_config_primary.js index 5d79df932a5..e06527c738b 100644 --- a/jstests/sharding/auth_no_config_primary.js +++ b/jstests/sharding/auth_no_config_primary.js @@ -52,4 +52,5 @@ TestData.skipCheckDBHashes = true; assert.eq('world', res.hello); st.stop(); + MongoRunner.stopMongos(otherMongos); })(); diff --git a/jstests/sharding/authmr.js b/jstests/sharding/authmr.js index fb5b5a94486..82f0b40b2fc 100644 --- a/jstests/sharding/authmr.js +++ b/jstests/sharding/authmr.js @@ -108,4 +108,5 @@ } }()); + cluster.stop(); })(); diff --git a/jstests/sharding/authwhere.js b/jstests/sharding/authwhere.js index a47dc5fb601..71a62c896c0 100644 --- a/jstests/sharding/authwhere.js +++ b/jstests/sharding/authwhere.js @@ -81,4 +81,5 @@ } }()); + cluster.stop(); })(); diff --git a/jstests/sharding/autodiscover_config_rs_from_secondary.js b/jstests/sharding/autodiscover_config_rs_from_secondary.js index 6fba3b1dede..d2f58f2ac5c 100644 --- a/jstests/sharding/autodiscover_config_rs_from_secondary.js +++ b/jstests/sharding/autodiscover_config_rs_from_secondary.js @@ -47,4 +47,6 @@ var admin = mongos.getDB('admin'); mongos.setSlaveOk(true); assert.eq(1, admin.foo.findOne().a); + MongoRunner.stopMongos(mongos); + rst.stopSet(); })(); diff --git a/jstests/sharding/causal_consistency_shell_support.js b/jstests/sharding/causal_consistency_shell_support.js index 13d0f53b3c3..fab5da53e21 100644 --- a/jstests/sharding/causal_consistency_shell_support.js +++ b/jstests/sharding/causal_consistency_shell_support.js @@ -194,5 +194,6 @@ ErrorCodes.InvalidOptions + ", because the afterClusterTime value, " + invalidTime + ", should not be ahead of the clusterTime, " + session.getClusterTime().clusterTime); + rst.stopSet(); st.stop(); })(); diff --git a/jstests/sharding/change_streams.js b/jstests/sharding/change_streams.js index 3cb35d318bb..404b73c72ef 100644 --- a/jstests/sharding/change_streams.js +++ b/jstests/sharding/change_streams.js @@ -167,5 +167,5 @@ pipeline: [{$changeStream: {resumeAfter: resumeToken}}], expectedCode: 40615 }); - + st.stop(); })(); diff --git a/jstests/sharding/change_streams_shards_start_in_sync.js b/jstests/sharding/change_streams_shards_start_in_sync.js index 3a32146f0d8..3ed7d3fe98a 100644 --- a/jstests/sharding/change_streams_shards_start_in_sync.js +++ b/jstests/sharding/change_streams_shards_start_in_sync.js @@ -109,4 +109,5 @@ assert.writeOK(mongosColl.insert({_id: -1002}, {writeConcern: {w: "majority"}})); waitForShell(); + st.stop(); })(); diff --git a/jstests/sharding/cleanup_orphaned_basic.js b/jstests/sharding/cleanup_orphaned_basic.js index cd23a4f9507..66fe7924157 100644 --- a/jstests/sharding/cleanup_orphaned_basic.js +++ b/jstests/sharding/cleanup_orphaned_basic.js @@ -117,5 +117,6 @@ {cleanupOrphaned: coll2.getFullName(), startingFromKey: {a: 'someValue', c: 1}})); st.stop(); + MongoRunner.stopMongod(mongod); })(); diff --git a/jstests/sharding/cleanup_orphaned_cmd_during_movechunk.js b/jstests/sharding/cleanup_orphaned_cmd_during_movechunk.js index bf8471b2e98..6341dbb887d 100644 --- a/jstests/sharding/cleanup_orphaned_cmd_during_movechunk.js +++ b/jstests/sharding/cleanup_orphaned_cmd_during_movechunk.js @@ -153,5 +153,6 @@ load('./jstests/libs/cleanup_orphaned_util.js'); assert.eq(31, coll.count()); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js b/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js index 1468fb79f1e..8fb97e4aa1a 100644 --- a/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js +++ b/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js @@ -123,6 +123,7 @@ load('./jstests/libs/cleanup_orphaned_util.js'); assert.eq(1, recipColl.count()); assert.eq(1, coll.count()); + MongoRunner.stopMongod(staticMongod); st.stop(); })(); diff --git a/jstests/sharding/commands_that_write_accept_wc_configRS.js b/jstests/sharding/commands_that_write_accept_wc_configRS.js index 847046e142c..1f436cc163b 100644 --- a/jstests/sharding/commands_that_write_accept_wc_configRS.js +++ b/jstests/sharding/commands_that_write_accept_wc_configRS.js @@ -217,4 +217,5 @@ load('jstests/multiVersion/libs/auth_helpers.js'); testValidWriteConcern(majorityWC, cmd); }); + st.stop(); })(); diff --git a/jstests/sharding/commands_that_write_accept_wc_shards.js b/jstests/sharding/commands_that_write_accept_wc_shards.js index e8824fb2c42..deca9f2d28f 100644 --- a/jstests/sharding/commands_that_write_accept_wc_shards.js +++ b/jstests/sharding/commands_that_write_accept_wc_shards.js @@ -385,4 +385,6 @@ load('jstests/libs/write_concern_util.js'); testValidWriteConcern(cmd); testInvalidWriteConcern(cmd); }); + + st.stop(); })(); diff --git a/jstests/sharding/config_rs_no_primary.js b/jstests/sharding/config_rs_no_primary.js index fee859a994e..92196425263 100644 --- a/jstests/sharding/config_rs_no_primary.js +++ b/jstests/sharding/config_rs_no_primary.js @@ -56,4 +56,5 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true; testOps(st.s); st.stop(); + MongoRunner.stopMongos(mongos2); }()); diff --git a/jstests/sharding/config_version_rollback.js b/jstests/sharding/config_version_rollback.js index 0f70a641ea1..95bc6be936a 100644 --- a/jstests/sharding/config_version_rollback.js +++ b/jstests/sharding/config_version_rollback.js @@ -169,5 +169,7 @@ shardIdentityDoc.clusterId, "oldPriClusterId: " + origConfigVersionDoc.clusterId); configRS.stopSet(); + MongoRunner.stopMongod(shard); + MongoRunner.stopMongos(mongos); })(); diff --git a/jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js b/jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js index 1432c31c694..a955f17b0cb 100644 --- a/jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js +++ b/jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js @@ -194,5 +194,6 @@ checkCommandConfigSvr( {_configsvrDropDatabase: dbName}, setupFuncs.createDatabase, cleanupFuncs.dropDatabase); + MongoRunner.stopMongos(newShard); st.stop(); })(); diff --git a/jstests/sharding/conn_pool_stats.js b/jstests/sharding/conn_pool_stats.js index 04952a273b6..7c248f383e6 100644 --- a/jstests/sharding/conn_pool_stats.js +++ b/jstests/sharding/conn_pool_stats.js @@ -29,4 +29,5 @@ stats["totalCreated"], tojson(stats)); } + cluster.stop(); })(); diff --git a/jstests/sharding/error_propagation.js b/jstests/sharding/error_propagation.js index ee113329138..596534bf094 100644 --- a/jstests/sharding/error_propagation.js +++ b/jstests/sharding/error_propagation.js @@ -20,4 +20,5 @@ {aggregate: 'foo', pipeline: [{$project: {total: {'$add': ['$a', 1]}}}], cursor: {}}); assert.commandFailed(res); assert.eq("$add only supports numeric or date types, not array", res.errmsg, printjson(res)); + st.stop(); }()); diff --git a/jstests/sharding/idhack_sharded.js b/jstests/sharding/idhack_sharded.js index 475014d0fa5..4767e579c75 100644 --- a/jstests/sharding/idhack_sharded.js +++ b/jstests/sharding/idhack_sharded.js @@ -32,3 +32,5 @@ assert.eq(2, coll.count()); assert.eq(1, coll.find().itcount()); assert.eq(1, coll.find({_id: 1}, {_id: 1}).itcount()); coll.remove({}); + +st.stop(); diff --git a/jstests/sharding/ismaster.js b/jstests/sharding/ismaster.js index b3500cf6009..47dff297e96 100644 --- a/jstests/sharding/ismaster.js +++ b/jstests/sharding/ismaster.js @@ -36,3 +36,4 @@ for (field in res) { } assert(badFields.length === 0, "\nthe result:\n" + tojson(res) + "\ncontained fields it shouldn't have: " + badFields); +st.stop(); diff --git a/jstests/sharding/keys_rotation_interval_sec.js b/jstests/sharding/keys_rotation_interval_sec.js index bea10908dfc..e9cb873fb67 100644 --- a/jstests/sharding/keys_rotation_interval_sec.js +++ b/jstests/sharding/keys_rotation_interval_sec.js @@ -27,4 +27,5 @@ "key document " + i + ": " + tojson(key) + "expiresAt value is greater than: " + maxExpireTime); }); + st.stop(); })(); diff --git a/jstests/sharding/kill_op_overflow.js b/jstests/sharding/kill_op_overflow.js index 0a4231f5753..2d30799b9aa 100644 --- a/jstests/sharding/kill_op_overflow.js +++ b/jstests/sharding/kill_op_overflow.js @@ -8,4 +8,5 @@ assert.commandFailed( st.s.getDB("admin").runCommand({killOp: 1, op: "shard0000:99999999999999999999999"})); + st.stop(); })(); diff --git a/jstests/sharding/listshards.js b/jstests/sharding/listshards.js index 77ecb53695d..cbde033dc94 100644 --- a/jstests/sharding/listshards.js +++ b/jstests/sharding/listshards.js @@ -64,5 +64,6 @@ rs1.stopSet(); shardTest.stop(); + MongoRunner.stopMongod(standaloneShard); })(); diff --git a/jstests/sharding/mapReduce_inSharded.js b/jstests/sharding/mapReduce_inSharded.js index 52eb379e1fd..853cdb33bad 100644 --- a/jstests/sharding/mapReduce_inSharded.js +++ b/jstests/sharding/mapReduce_inSharded.js @@ -82,4 +82,5 @@ {out: {inline: 1}, query: {str: "foo"}, collation: {locale: "en_US", strength: 2}}); assert.commandWorked(out); assert.eq(out.counts.input, 1); + st.stop(); })(); diff --git a/jstests/sharding/mapReduce_nonSharded.js b/jstests/sharding/mapReduce_nonSharded.js index 40fb098931b..ad94004a68a 100644 --- a/jstests/sharding/mapReduce_nonSharded.js +++ b/jstests/sharding/mapReduce_nonSharded.js @@ -60,3 +60,4 @@ out = db.runCommand({ out: "mrBasic" + "srcNonSharded", }); verifyOutput(out); +st.stop(); diff --git a/jstests/sharding/mapReduce_outSharded.js b/jstests/sharding/mapReduce_outSharded.js index 34cde2b63ef..90452c0c186 100644 --- a/jstests/sharding/mapReduce_outSharded.js +++ b/jstests/sharding/mapReduce_outSharded.js @@ -58,3 +58,4 @@ out = db.runCommand({ out: "mrBasic" + "srcNonSharded", }); verifyOutput(out); +st.stop(); diff --git a/jstests/sharding/migration_critical_section_concurrency.js b/jstests/sharding/migration_critical_section_concurrency.js index 2da0c983031..e51d9d5d738 100644 --- a/jstests/sharding/migration_critical_section_concurrency.js +++ b/jstests/sharding/migration_critical_section_concurrency.js @@ -64,4 +64,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); joinMoveChunk(); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_ignore_interrupts_1.js b/jstests/sharding/migration_ignore_interrupts_1.js index e3dbf3a2ad2..83a77f08445 100644 --- a/jstests/sharding/migration_ignore_interrupts_1.js +++ b/jstests/sharding/migration_ignore_interrupts_1.js @@ -73,4 +73,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); assert.eq(1, shard2Coll1.find().itcount()); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_ignore_interrupts_2.js b/jstests/sharding/migration_ignore_interrupts_2.js index cd09bd24365..718c6a347ff 100644 --- a/jstests/sharding/migration_ignore_interrupts_2.js +++ b/jstests/sharding/migration_ignore_interrupts_2.js @@ -53,4 +53,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); assert.eq(1, shard1Coll1.find().itcount()); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_ignore_interrupts_3.js b/jstests/sharding/migration_ignore_interrupts_3.js index 4c606d357ac..13c5b15f6f9 100644 --- a/jstests/sharding/migration_ignore_interrupts_3.js +++ b/jstests/sharding/migration_ignore_interrupts_3.js @@ -104,4 +104,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); assert.eq(1, shard2Coll2.find().itcount(), "shard2 failed to complete migration."); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_ignore_interrupts_4.js b/jstests/sharding/migration_ignore_interrupts_4.js index 3d943639e83..64c7b89e25e 100644 --- a/jstests/sharding/migration_ignore_interrupts_4.js +++ b/jstests/sharding/migration_ignore_interrupts_4.js @@ -105,4 +105,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); assert.eq(3, shard2Coll2.find().itcount(), "shard2 failed to complete migration."); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_move_chunk_after_receive.js b/jstests/sharding/migration_move_chunk_after_receive.js index 08129343ac8..662dc1879e4 100644 --- a/jstests/sharding/migration_move_chunk_after_receive.js +++ b/jstests/sharding/migration_move_chunk_after_receive.js @@ -70,4 +70,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); assert.eq(4, foundDocs.length, 'Incorrect number of documents found ' + tojson(foundDocs)); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_server_status.js b/jstests/sharding/migration_server_status.js index f084f094dd2..63f4c828d1e 100644 --- a/jstests/sharding/migration_server_status.js +++ b/jstests/sharding/migration_server_status.js @@ -72,5 +72,6 @@ load('./jstests/libs/chunk_manipulation_util.js'); assert(!shard0ServerStatus.sharding.migrations); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_sets_fromMigrate_flag.js b/jstests/sharding/migration_sets_fromMigrate_flag.js index 5a19e5ede95..7b0802286b1 100644 --- a/jstests/sharding/migration_sets_fromMigrate_flag.js +++ b/jstests/sharding/migration_sets_fromMigrate_flag.js @@ -190,4 +190,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); "migration! Test #5 failed."); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/migration_with_source_ops.js b/jstests/sharding/migration_with_source_ops.js index b837191c4ee..2fc2c467c0f 100644 --- a/jstests/sharding/migration_with_source_ops.js +++ b/jstests/sharding/migration_with_source_ops.js @@ -139,6 +139,7 @@ load('./jstests/libs/chunk_manipulation_util.js'); assert.eq(1, recipientCollUpdatedNum, "Update failed on recipient shard during migration!"); jsTest.log('DONE!'); + MongoRunner.stopMongod(staticMongod); st.stop(); })(); diff --git a/jstests/sharding/mongos_wait_csrs_initiate.js b/jstests/sharding/mongos_wait_csrs_initiate.js index 8e6e8750938..6dbd71a1427 100644 --- a/jstests/sharding/mongos_wait_csrs_initiate.js +++ b/jstests/sharding/mongos_wait_csrs_initiate.js @@ -36,3 +36,5 @@ assert.soon( jsTestLog("got mongos"); assert.commandWorked(mongos2.getDB('admin').runCommand('serverStatus')); +configRS.stopSet(); +MongoRunner.stopMongos(mongos);
\ No newline at end of file diff --git a/jstests/sharding/move_chunk_wc.js b/jstests/sharding/move_chunk_wc.js index 0cc8c163b6e..3d7e1e9edb9 100644 --- a/jstests/sharding/move_chunk_wc.js +++ b/jstests/sharding/move_chunk_wc.js @@ -101,4 +101,5 @@ load('jstests/libs/write_concern_util.js'); assert.commandFailed(res); assert(!res.writeConcernError, 'moveChunk had writeConcernError: ' + tojson(res)); checkChunkCount(1, 1); + st.stop(); })(); diff --git a/jstests/sharding/movechunk_interrupt_at_primary_stepdown.js b/jstests/sharding/movechunk_interrupt_at_primary_stepdown.js index de7a4f9e4bc..70d0edd6258 100644 --- a/jstests/sharding/movechunk_interrupt_at_primary_stepdown.js +++ b/jstests/sharding/movechunk_interrupt_at_primary_stepdown.js @@ -79,4 +79,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); .itcount()); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/movechunk_parallel.js b/jstests/sharding/movechunk_parallel.js index 9de8da268f1..8e54d0ab551 100644 --- a/jstests/sharding/movechunk_parallel.js +++ b/jstests/sharding/movechunk_parallel.js @@ -77,4 +77,5 @@ load('./jstests/libs/chunk_manipulation_util.js'); .itcount()); st.stop(); + MongoRunner.stopMongod(staticMongod); })(); diff --git a/jstests/sharding/mr_noscripting.js b/jstests/sharding/mr_noscripting.js index a2940d51c43..6bf196c587e 100644 --- a/jstests/sharding/mr_noscripting.js +++ b/jstests/sharding/mr_noscripting.js @@ -37,3 +37,4 @@ mongos.getDB('config').shards.find().forEach(function(shardDoc) { assert(cmdResult.ok, 'serverStatus on ' + shardDoc.host + ' failed, result: ' + tojson(cmdResult)); }); +st.stop();
\ No newline at end of file diff --git a/jstests/sharding/names.js b/jstests/sharding/names.js index 33a337e5656..48064c813ba 100644 --- a/jstests/sharding/names.js +++ b/jstests/sharding/names.js @@ -46,7 +46,8 @@ rsB.getURL(), config.shards.findOne({_id: rsA.name})["host"], "Wrong host for shard rsA 3"); assert.eq( rsA.getURL(), config.shards.findOne({_id: rsB.name})["host"], "Wrong host for shard rsB 3"); - + rsA.stopSet(); + rsB.stopSet(); st.stop(); })(); diff --git a/jstests/sharding/nonreplicated_uuids_on_shardservers.js b/jstests/sharding/nonreplicated_uuids_on_shardservers.js index ab3f878189f..7c7be172ee1 100644 --- a/jstests/sharding/nonreplicated_uuids_on_shardservers.js +++ b/jstests/sharding/nonreplicated_uuids_on_shardservers.js @@ -19,4 +19,5 @@ // Ensure the new node has UUIDs for all its collections. checkCollectionUUIDs(secondaryAdminDB); + st.stop(); })(); diff --git a/jstests/sharding/query_config.js b/jstests/sharding/query_config.js index 64743e84e11..4b0761790d4 100644 --- a/jstests/sharding/query_config.js +++ b/jstests/sharding/query_config.js @@ -386,4 +386,5 @@ queryConfigChunks(st); queryUserCreated(configDB); queryUserCreated(adminDB); + st.stop(); })(); diff --git a/jstests/sharding/read_after_optime.js b/jstests/sharding/read_after_optime.js index c4e6b16aaa8..919f44f9b52 100644 --- a/jstests/sharding/read_after_optime.js +++ b/jstests/sharding/read_after_optime.js @@ -48,4 +48,5 @@ } return false; }, 'Did not see any log entries containing the following message: ' + msg, 60000, 300); + shardingTest.stop(); })(); diff --git a/jstests/sharding/read_committed_lookup.js b/jstests/sharding/read_committed_lookup.js index f2249ddf756..90808f319db 100644 --- a/jstests/sharding/read_committed_lookup.js +++ b/jstests/sharding/read_committed_lookup.js @@ -60,5 +60,6 @@ load("jstests/libs/read_committed_lib.js"); // For testReadCommittedLookup testReadCommittedLookup(st.s.getDB("test"), shardSecondary, rst); st.stop(); + rst.stopSet(); })(); diff --git a/jstests/sharding/read_pref.js b/jstests/sharding/read_pref.js index 0640c347871..6f0db25f90e 100644 --- a/jstests/sharding/read_pref.js +++ b/jstests/sharding/read_pref.js @@ -28,6 +28,7 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true; // The $-prefixed query syntax is only legal for compatibility mode reads, not for the // find/getMore commands. if (useDollarQuerySyntax && st.s.getDB("test").getMongo().useReadCommands()) { + st.stop(); return; } diff --git a/jstests/sharding/refresh_sessions.js b/jstests/sharding/refresh_sessions.js index 1e2bac22c8e..8199ffb4563 100644 --- a/jstests/sharding/refresh_sessions.js +++ b/jstests/sharding/refresh_sessions.js @@ -78,4 +78,6 @@ sessionCount + 3, "refresh on shard did not flush session records to disk"); } + + cluster.stop(); })(); diff --git a/jstests/sharding/sessions_collection_auto_healing.js b/jstests/sharding/sessions_collection_auto_healing.js index 0c7ab95fa42..5dcf6d66590 100644 --- a/jstests/sharding/sessions_collection_auto_healing.js +++ b/jstests/sharding/sessions_collection_auto_healing.js @@ -136,5 +136,6 @@ load('jstests/libs/sessions_collection.js'); } st.stop(); + rs.stopSet(); })(); diff --git a/jstests/sharding/shard7.js b/jstests/sharding/shard7.js index ce0ce708784..0f7f7acc28b 100644 --- a/jstests/sharding/shard7.js +++ b/jstests/sharding/shard7.js @@ -52,3 +52,5 @@ c.save({a: 2, b: 2, loc: [0, 0]}); near = db.runCommand({geoNear: 'foo', near: [0, 0], query: unsatisfiable}); assert.commandWorked(near); assert.eq(0, near.results.length); + +s.stop(); diff --git a/jstests/sharding/sharding_system_namespaces.js b/jstests/sharding/sharding_system_namespaces.js index f721c07634d..851a1d06582 100644 --- a/jstests/sharding/sharding_system_namespaces.js +++ b/jstests/sharding/sharding_system_namespaces.js @@ -60,3 +60,4 @@ if (Array.contains(storageEngines, "wiredTiger")) { } else { print("Skipping test. wiredTiger engine not supported by mongod binary."); } +st.stop(); diff --git a/jstests/sharding/startup_with_all_configs_down.js b/jstests/sharding/startup_with_all_configs_down.js index bd791b71b2f..cef9ec46327 100644 --- a/jstests/sharding/startup_with_all_configs_down.js +++ b/jstests/sharding/startup_with_all_configs_down.js @@ -97,4 +97,5 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true; assert.eq(100, newMongosConn.getDB('test').foo.find().itcount()); st.stop(); + MongoRunner.stopMongos(newMongosInfo); }()); diff --git a/jstests/sharding/validate_collection.js b/jstests/sharding/validate_collection.js index 80502ef8cbb..b67a42df6ea 100644 --- a/jstests/sharding/validate_collection.js +++ b/jstests/sharding/validate_collection.js @@ -81,4 +81,6 @@ setFailValidateFailPointOnShard(true, primaryShard); validate(false); setFailValidateFailPointOnShard(false, primaryShard); + + st.stop(); })(); |