xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-24163 remove waitForCSRSSecondaries:false from multiversion tests, which was only needed for 3.2 compatibility

Browse Source
This commit is contained in:
Dianna Hohensee
2017-01-10 09:32:08 -05:00
parent d13efaa5a6
commit a3ff4e388f
6 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jstests/multiVersion/2_test_launching_cluster.js
View File

@@ -20,9 +20,7 @@ load('./jstests/multiVersion/libs/verify_versions.js');
mongosOptions: {binVersion: versionsToCheckMongos},
configOptions: {binVersion: versionsToCheck},
shardOptions: {binVersion: versionsToCheck},
enableBalancer: true,
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false,
enableBalancer: true
}
});
@@ -64,9 +62,7 @@ load('./jstests/multiVersion/libs/verify_versions.js');
mongosOptions: {binVersion: versionsToCheckMongos},
configOptions: {binVersion: versionsToCheck},
rsOptions: {binVersion: versionsToCheck, protocolVersion: 0},
enableBalancer: true,
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false,
enableBalancer: true
}
});

5
jstests/multiVersion/balancer_multiVersion_detect.js
View File

@@ -5,13 +5,10 @@
jsTest.log("Starting cluster...");
var options = {
mongosOptions: {verbose: 1, useLogFiles: true},
configOptions: {},
shardOptions: {binVersion: ["latest", "last-stable"]},
enableBalancer: true,
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false
enableBalancer: true
};
var st = new ShardingTest({shards: 3, mongos: 1, other: options});

8
jstests/multiVersion/libs/dumprestore_helpers.js
View File

@@ -59,9 +59,7 @@ function multiVersionDumpRestoreTest(configObj) {
binVersion: configObj.serverSourceVersion,
storageEngine: configObj.storageEngine
}],
config: [{binVersion: configObj.serverSourceVersion}],
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false
config: [{binVersion: configObj.serverSourceVersion}]
};
var shardingTest = new ShardingTest(shardingTestConfig);
var serverSource = shardingTest.s;
@@ -125,9 +123,7 @@ function multiVersionDumpRestoreTest(configObj) {
mongos: [{binVersion: configObj.serverDestVersion}],
shards:
[{binVersion: configObj.serverDestVersion, storageEngine: configObj.storageEngine}],
config: [{binVersion: configObj.serverDestVersion}],
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false
config: [{binVersion: configObj.serverDestVersion}]
};
var shardingTest = new ShardingTest(shardingTestConfig);
serverDest = shardingTest.s;

4
jstests/multiVersion/migration_between_mixed_version_mongods.js
View File

@@ -17,9 +17,7 @@ load("./jstests/multiVersion/libs/verify_versions.js");
{binVersion: "latest"}
],
mongos: 1,
other: {mongosOptions: {binVersion: "last-stable"}},
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false
other: {mongosOptions: {binVersion: "last-stable"}}
};
var st = new ShardingTest(options);

4
jstests/multiVersion/upgrade_cluster.js
View File

@@ -39,9 +39,7 @@ load('./jstests/multiVersion/libs/multi_cluster.js');
shardOptions: {binVersion: "last-stable"},
rsOptions: {binVersion: "last-stable"},
rs: isRSCluster,
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false
rs: isRSCluster
}
});
st.configRS.awaitReplication();

21
src/mongo/shell/shardingtest.js
View File

@@ -80,9 +80,7 @@
* specify options that are common all replica members.
* useHostname {boolean}: if true, use hostname of machine,
* otherwise use localhost
* numReplicas {number},
* waitForCSRSSecondaries {boolean}: if false, will not wait for the read committed view
* of the secondaries to catch up with the primary. Defaults to true.
* numReplicas {number}
* }
* }
*
@@ -1024,9 +1022,6 @@ var ShardingTest = function(params) {
var mongosVerboseLevel = otherParams.hasOwnProperty('verbose') ? otherParams.verbose : 1;
var numMongos = otherParams.hasOwnProperty('mongos') ? otherParams.mongos : 1;
var numConfigs = otherParams.hasOwnProperty('config') ? otherParams.config : 3;
var waitForCSRSSecondaries = otherParams.hasOwnProperty('waitForCSRSSecondaries')
? otherParams.waitForCSRSSecondaries
: true;
// Default enableBalancer to false.
otherParams.enableBalancer =
@@ -1476,14 +1471,12 @@ var ShardingTest = function(params) {
throw e;
}
if (waitForCSRSSecondaries) {
// Ensure that all CSRS nodes are up to date. This is strictly needed for tests that use
// multiple mongoses. In those cases, the first mongos initializes the contents of the
// 'config' database, but without waiting for those writes to replicate to all the
// config servers then the secondary mongoses risk reading from a stale config server
// and seeing an empty config database.
this.configRS.awaitLastOpCommitted();
}
// Ensure that all CSRS nodes are up to date. This is strictly needed for tests that use
// multiple mongoses. In those cases, the first mongos initializes the contents of the 'config'
// database, but without waiting for those writes to replicate to all the config servers then
// the secondary mongoses risk reading from a stale config server and seeing an empty config
// database.
this.configRS.awaitLastOpCommitted();
if (jsTestOptions().keyFile) {
jsTest.authenticate(configConnection);