summaryrefslogtreecommitdiff
path: root/jstests/sharding
diff options
context:
space:
mode:
Diffstat (limited to 'jstests/sharding')
-rw-r--r--jstests/sharding/advance_cluster_time_action_type.js9
-rw-r--r--jstests/sharding/aggregation_currentop.js2
-rw-r--r--jstests/sharding/auth.js2
-rw-r--r--jstests/sharding/auth2.js4
-rw-r--r--jstests/sharding/authCommands.js2
-rw-r--r--jstests/sharding/authConnectionHook.js13
-rw-r--r--jstests/sharding/auth_add_shard.js14
-rw-r--r--jstests/sharding/auth_no_config_primary.js4
-rw-r--r--jstests/sharding/auth_sharding_cmd_metadata.js2
-rw-r--r--jstests/sharding/auth_slaveok_routing.js6
-rw-r--r--jstests/sharding/authmr.js9
-rw-r--r--jstests/sharding/authwhere.js9
-rw-r--r--jstests/sharding/cleanup_orphaned_auth.js6
-rw-r--r--jstests/sharding/localhostAuthBypass.js7
-rw-r--r--jstests/sharding/mongod_returns_no_cluster_time_without_keys.js2
-rw-r--r--jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js2
16 files changed, 24 insertions, 69 deletions
diff --git a/jstests/sharding/advance_cluster_time_action_type.js b/jstests/sharding/advance_cluster_time_action_type.js
index 1fff92c5e1d..fb3f1184e84 100644
--- a/jstests/sharding/advance_cluster_time_action_type.js
+++ b/jstests/sharding/advance_cluster_time_action_type.js
@@ -8,14 +8,7 @@
// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
TestData.disableImplicitSessions = true;
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-let st = new ShardingTest({
- mongos: 1,
- config: 1,
- shards: 1,
- keyFile: 'jstests/libs/key1',
- other: {shardAsReplicaSet: false}
-});
+let st = new ShardingTest({mongos: 1, config: 1, shards: 1, keyFile: 'jstests/libs/key1'});
let adminDB = st.s.getDB('admin');
diff --git a/jstests/sharding/aggregation_currentop.js b/jstests/sharding/aggregation_currentop.js
index 78b15dfb55b..f3b6ac3be5c 100644
--- a/jstests/sharding/aggregation_currentop.js
+++ b/jstests/sharding/aggregation_currentop.js
@@ -31,8 +31,6 @@ load("jstests/libs/namespace_utils.js"); // For getCollectionNameFromFullNamesp
// briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
// gossip that time later in setup.
//
-// TODO SERVER-32672: remove this flag.
-TestData.skipGossipingClusterTime = true;
const key = "jstests/libs/key1";
diff --git a/jstests/sharding/auth.js b/jstests/sharding/auth.js
index 5131c512271..0bf917135ef 100644
--- a/jstests/sharding/auth.js
+++ b/jstests/sharding/auth.js
@@ -16,8 +16,6 @@ load("jstests/replsets/rslib.js");
// briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
// gossip that time later in setup.
//
-// TODO SERVER-32672: remove this flag.
-TestData.skipGossipingClusterTime = true;
var adminUser = {db: "admin", username: "foo", password: "bar"};
diff --git a/jstests/sharding/auth2.js b/jstests/sharding/auth2.js
index d1d6cb20156..8a763f54569 100644
--- a/jstests/sharding/auth2.js
+++ b/jstests/sharding/auth2.js
@@ -1,11 +1,9 @@
(function() {
'use strict';
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
var st = new ShardingTest({
shards: 2,
- other:
- {chunkSize: 1, useHostname: true, keyFile: 'jstests/libs/key1', shardAsReplicaSet: false},
+ other: {chunkSize: 1, useHostname: true, keyFile: 'jstests/libs/key1'},
});
var mongos = st.s;
diff --git a/jstests/sharding/authCommands.js b/jstests/sharding/authCommands.js
index 2692bc9bc42..6c3f905f266 100644
--- a/jstests/sharding/authCommands.js
+++ b/jstests/sharding/authCommands.js
@@ -15,8 +15,6 @@ load("jstests/replsets/rslib.js");
// briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
// gossip that time later in setup.
//
-// TODO SERVER-32672: remove this flag.
-TestData.skipGossipingClusterTime = true;
var st = new ShardingTest({
shards: 2,
diff --git a/jstests/sharding/authConnectionHook.js b/jstests/sharding/authConnectionHook.js
index 73e81393d44..08e1d60db28 100644
--- a/jstests/sharding/authConnectionHook.js
+++ b/jstests/sharding/authConnectionHook.js
@@ -16,11 +16,8 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
(function() {
'use strict';
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-var st = new ShardingTest({
- shards: 2,
- other: {keyFile: 'jstests/libs/key1', useHostname: true, chunkSize: 1, shardAsReplicaSet: false}
-});
+var st = new ShardingTest(
+ {shards: 2, other: {keyFile: 'jstests/libs/key1', useHostname: true, chunkSize: 1}});
var mongos = st.s;
var adminDB = mongos.getDB('admin');
@@ -31,7 +28,7 @@ adminDB.createUser({user: 'admin', pwd: 'password', roles: jsTest.adminUserRoles
adminDB.auth('admin', 'password');
adminDB.runCommand({enableSharding: "test"});
-st.ensurePrimaryShard('test', 'shard0001');
+st.ensurePrimaryShard('test', st.shard1.shardName);
adminDB.runCommand({shardCollection: "test.foo", key: {x: 1}});
for (var i = 0; i < 100; i++) {
@@ -45,8 +42,8 @@ adminDB.runCommand({moveChunk: "test.foo", find: {x: 25}, to: otherShard, _waitF
st.printShardingStatus();
-MongoRunner.stopMongod(st.shard0);
-st.shard0 = MongoRunner.runMongod({restart: st.shard0});
+st.rs0.stopSet(undefined, true);
+st.rs0.startSet({}, true);
// May fail the first couple times due to socket exceptions
assert.soon(function() {
diff --git a/jstests/sharding/auth_add_shard.js b/jstests/sharding/auth_add_shard.js
index 6c3c298b373..b2c0c870b09 100644
--- a/jstests/sharding/auth_add_shard.js
+++ b/jstests/sharding/auth_add_shard.js
@@ -14,9 +14,7 @@ function login(userObj) {
var adminUser = {db: "admin", username: "foo", password: "bar"};
// set up a 2 shard cluster with keyfile
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-var st = new ShardingTest(
- {shards: 1, mongos: 1, other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}});
+var st = new ShardingTest({shards: 1, mongos: 1, other: {keyFile: 'jstests/libs/key1'}});
var mongos = st.s0;
var admin = mongos.getDB("admin");
@@ -34,6 +32,7 @@ login(adminUser);
assert.eq(1, st.config.shards.count(), "initial server count wrong");
// start a mongod with NO keyfile
+// TODO: SERVER-43921 Make auth_add_shard.js start shards as replica sets.
var conn = MongoRunner.runMongod({shardsvr: ""});
print(conn);
@@ -46,9 +45,11 @@ MongoRunner.stopMongod(conn);
//--------------- Test 2 --------------------
// start mongod again, this time with keyfile
+// TODO: SERVER-43921 Make auth_add_shard.js start shards as replica sets.
var conn = MongoRunner.runMongod({keyFile: "jstests/libs/key1", shardsvr: ""});
// try adding the new shard
-assert.commandWorked(admin.runCommand({addShard: conn.host}));
+var addShardRes = admin.runCommand({addShard: conn.host});
+assert.commandWorked(addShardRes);
// Add some data
var db = mongos.getDB("foo");
@@ -56,7 +57,7 @@ var collA = mongos.getCollection("foo.bar");
// enable sharding on a collection
assert.commandWorked(admin.runCommand({enableSharding: "" + collA.getDB()}));
-st.ensurePrimaryShard("foo", "shard0000");
+st.ensurePrimaryShard("foo", st.shard0.shardName);
assert.commandWorked(admin.runCommand({shardCollection: "" + collA, key: {_id: 1}}));
@@ -67,7 +68,8 @@ for (var i = 0; i < 4; i++) {
}
// move a chunk
-assert.commandWorked(admin.runCommand({moveChunk: "foo.bar", find: {_id: 1}, to: "shard0001"}));
+assert.commandWorked(
+ admin.runCommand({moveChunk: "foo.bar", find: {_id: 1}, to: addShardRes.shardAdded}));
// verify the chunk was moved
admin.runCommand({flushRouterConfig: 1});
diff --git a/jstests/sharding/auth_no_config_primary.js b/jstests/sharding/auth_no_config_primary.js
index 57d6f2109b0..a9ed9a5c21a 100644
--- a/jstests/sharding/auth_no_config_primary.js
+++ b/jstests/sharding/auth_no_config_primary.js
@@ -14,9 +14,7 @@ TestData.skipCheckDBHashes = true;
(function() {
'use strict';
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-var st =
- new ShardingTest({shards: 1, other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}});
+var st = new ShardingTest({shards: 1, other: {keyFile: 'jstests/libs/key1'}});
st.s.getDB('admin').createUser({user: 'root', pwd: 'pass', roles: ['root']});
st.s.getDB('admin').auth('root', 'pass');
diff --git a/jstests/sharding/auth_sharding_cmd_metadata.js b/jstests/sharding/auth_sharding_cmd_metadata.js
index d4474a26da7..8744e6dded6 100644
--- a/jstests/sharding/auth_sharding_cmd_metadata.js
+++ b/jstests/sharding/auth_sharding_cmd_metadata.js
@@ -5,7 +5,7 @@
"use strict";
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+// TODO: SERVER-43938 Make auth_sharding_cmd_metadata.js start shards as replica sets.
var st =
new ShardingTest({shards: 1, other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}});
diff --git a/jstests/sharding/auth_slaveok_routing.js b/jstests/sharding/auth_slaveok_routing.js
index 480d0c4318b..8eff7833c9b 100644
--- a/jstests/sharding/auth_slaveok_routing.js
+++ b/jstests/sharding/auth_slaveok_routing.js
@@ -19,8 +19,6 @@ load("jstests/replsets/rslib.js");
// briefly authenticates as __system and recieves clusterTime metadata then will fail trying to
// gossip that time later in setup.
//
-// TODO SERVER-32672: remove this flag.
-TestData.skipGossipingClusterTime = true;
/**
* Checks if a query to the given collection will be routed to the secondary. Returns true if
@@ -39,9 +37,7 @@ function doesRouteToSec(coll, query) {
}
var rsOpts = {oplogSize: 50};
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-var st = new ShardingTest(
- {shards: 1, rs: rsOpts, other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}});
+var st = new ShardingTest({shards: 1, rs: rsOpts, other: {keyFile: 'jstests/libs/key1'}});
var mongos = st.s;
var replTest = st.rs0;
diff --git a/jstests/sharding/authmr.js b/jstests/sharding/authmr.js
index 9b0fbe240ce..e3c80f3ad55 100644
--- a/jstests/sharding/authmr.js
+++ b/jstests/sharding/authmr.js
@@ -27,13 +27,8 @@ function assertInsert(collection, obj) {
assert.commandWorked(collection.insert(obj));
}
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-var cluster = new ShardingTest({
- name: "authmr",
- shards: 1,
- mongos: 1,
- other: {keyFile: "jstests/libs/key1", shardAsReplicaSet: false}
-});
+var cluster =
+ new ShardingTest({name: "authmr", shards: 1, mongos: 1, other: {keyFile: "jstests/libs/key1"}});
// Set up the test data.
(function() {
diff --git a/jstests/sharding/authwhere.js b/jstests/sharding/authwhere.js
index e9b338801bf..bd0d4721f85 100644
--- a/jstests/sharding/authwhere.js
+++ b/jstests/sharding/authwhere.js
@@ -27,13 +27,8 @@ function assertInsert(collection, obj) {
assert.commandWorked(collection.insert(obj));
}
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-var cluster = new ShardingTest({
- name: "authwhere",
- shards: 1,
- mongos: 1,
- other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}
-});
+var cluster = new ShardingTest(
+ {name: "authwhere", shards: 1, mongos: 1, other: {keyFile: 'jstests/libs/key1'}});
// Set up the test data.
(function() {
diff --git a/jstests/sharding/cleanup_orphaned_auth.js b/jstests/sharding/cleanup_orphaned_auth.js
index a54030fbf12..8b0fac00f5d 100644
--- a/jstests/sharding/cleanup_orphaned_auth.js
+++ b/jstests/sharding/cleanup_orphaned_auth.js
@@ -23,11 +23,7 @@ function assertUnauthorized(res, msg) {
doassert(finalMsg);
}
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
-var st = new ShardingTest({
- auth: true,
- other: {keyFile: 'jstests/libs/key1', useHostname: false, shardAsReplicaSet: false}
-});
+var st = new ShardingTest({auth: true, other: {keyFile: 'jstests/libs/key1', useHostname: false}});
var shardAdmin = st.shard0.getDB('admin');
shardAdmin.createUser({user: 'admin', pwd: 'x', roles: ['clusterAdmin', 'userAdminAnyDatabase']});
diff --git a/jstests/sharding/localhostAuthBypass.js b/jstests/sharding/localhostAuthBypass.js
index c2f9a8a75ad..6dd8a9d6d62 100644
--- a/jstests/sharding/localhostAuthBypass.js
+++ b/jstests/sharding/localhostAuthBypass.js
@@ -178,7 +178,6 @@ var setupSharding = function(shardingTest) {
};
var start = function() {
- // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
return new ShardingTest({
auth: "",
shards: numShards,
@@ -187,7 +186,6 @@ var start = function() {
chunkSize: 1,
useHostname:
false, // Must use localhost to take advantage of the localhost auth bypass
- shardAsReplicaSet: false
}
});
};
@@ -208,10 +206,7 @@ var shutdown = function(st) {
}
for (var i = 0; i < st._connections.length; i++) {
- var conn = st["shard" + i];
- MongoRunner.stopMongod(conn,
- /*signal*/ false,
- {auth: {user: username, pwd: password}});
+ st["rs" + i].stopSet(/*signal*/ false, {auth: {user: username, pwd: password}});
}
for (var i = 0; i < st._configServers.length; i++) {
diff --git a/jstests/sharding/mongod_returns_no_cluster_time_without_keys.js b/jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
index 82bdaeed018..2665415aab5 100644
--- a/jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
+++ b/jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
@@ -15,8 +15,6 @@ TestData.disableImplicitSessions = true;
load("jstests/multiVersion/libs/multi_rs.js");
-// TODO SERVER-32672: remove this flag.
-TestData.skipGossipingClusterTime = true;
const keyFile = 'jstests/libs/key1';
const adminUser = {
db: "admin",
diff --git a/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js b/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
index fa03a0310ba..226548fa88e 100644
--- a/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
+++ b/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
@@ -21,8 +21,6 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
// authenticates as __system and recieves clusterTime metadata then will fail trying to gossip that
// time later in setup.
//
-// TODO SERVER-32672: remove this flag.
-TestData.skipGossipingClusterTime = true;
// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
TestData.disableImplicitSessions = true;
View Lorry Controller Status