summaryrefslogtreecommitdiff
path: root/jstests
diff options
context:
space:
mode:
authorSiyuan Zhou <siyuan.zhou@mongodb.com>2015-07-29 18:02:37 -0400
committerSiyuan Zhou <siyuan.zhou@mongodb.com>2015-09-23 14:50:56 -0400
commit2c1facf471cce8254e314755c3c7d2fbc753e5f4 (patch)
tree8e3f51519dd151cda6799dd52e6d0640c4a0ec05 /jstests
parent75115dfaab9da2854b0fd892ce029781afea2731 (diff)
downloadmongo-2c1facf471cce8254e314755c3c7d2fbc753e5f4.tar.gz
SERVER-18498 New replica set configurations have protocolVersion=1 by default
Diffstat (limited to 'jstests')
-rw-r--r--jstests/multiVersion/2_test_launching_cluster.js5
-rw-r--r--jstests/multiVersion/downgrade_replset.js4
-rw-r--r--jstests/multiVersion/initialsync.js7
-rw-r--r--jstests/multiVersion/mixed_storage_version_replication.js3
-rw-r--r--jstests/multiVersion/upgrade_downgrade_mongod.js4
-rw-r--r--jstests/multiVersion/wt_index_option_defaults_replset.js1
-rw-r--r--jstests/noPassthrough/initial_sync_cloner_dups.js4
-rw-r--r--jstests/noPassthroughWithMongod/ttl_repl.js7
-rw-r--r--jstests/replsets/bulk_api_wc.js2
-rw-r--r--jstests/replsets/election_not_blocked.js3
-rw-r--r--jstests/replsets/initial_sync1.js37
-rw-r--r--jstests/replsets/initial_sync2.js22
-rw-r--r--jstests/replsets/maintenance.js5
-rw-r--r--jstests/replsets/oplog_note_cmd.js2
-rw-r--r--jstests/replsets/protocol_version_upgrade_downgrade.js7
-rw-r--r--jstests/replsets/read_after_optime.js8
-rw-r--r--jstests/replsets/remove1.js27
-rw-r--r--jstests/replsets/replset1.js3
-rw-r--r--jstests/replsets/tags.js3
-rw-r--r--jstests/sharding/csrs_upgrade_during_migrate.js13
-rw-r--r--jstests/sharding/diffservers1.js1
-rw-r--r--jstests/slow1/replsets_priority1.js2
-rw-r--r--jstests/tool/dumprestore10.js4
23 files changed, 85 insertions, 89 deletions
diff --git a/jstests/multiVersion/2_test_launching_cluster.js b/jstests/multiVersion/2_test_launching_cluster.js
index 6f00facaea3..014bf98fb6e 100644
--- a/jstests/multiVersion/2_test_launching_cluster.js
+++ b/jstests/multiVersion/2_test_launching_cluster.js
@@ -53,7 +53,7 @@ st = new ShardingTest({ shards : 2,
mongosOptions : { binVersion : versionsToCheck },
configOptions : { binVersion : versionsToCheck },
shardOptions : { binVersion : versionsToCheck }
-
+
} });
shards = [ st.shard0, st.shard1 ];
@@ -98,8 +98,7 @@ st = new ShardingTest({ shards : 2,
mongosOptions : { binVersion : versionsToCheck },
configOptions : { binVersion : versionsToCheck },
- rsOptions : { binVersion : versionsToCheck }
-
+ rsOptions : { binVersion : versionsToCheck, protocolVersion: 0 }
} });
var nodesA = st.rs0.nodes;
diff --git a/jstests/multiVersion/downgrade_replset.js b/jstests/multiVersion/downgrade_replset.js
index 17581827f11..6dd492efab3 100644
--- a/jstests/multiVersion/downgrade_replset.js
+++ b/jstests/multiVersion/downgrade_replset.js
@@ -14,7 +14,9 @@ var nodes = {n1: {binVersion: newVersion},
var rst = new ReplSetTest({name: name, nodes: nodes, nodeOptions: {storageEngine: 'mmapv1'}});
rst.startSet();
-rst.initiate();
+var replSetConfig = rst.getReplSetConfig();
+replSetConfig.protocolVersion = 0;
+rst.initiate(replSetConfig);
var primary = rst.getPrimary();
var coll = "test.foo";
diff --git a/jstests/multiVersion/initialsync.js b/jstests/multiVersion/initialsync.js
index 2fad997bf66..dac71ff24f4 100644
--- a/jstests/multiVersion/initialsync.js
+++ b/jstests/multiVersion/initialsync.js
@@ -14,7 +14,12 @@ var multitest = function(replSetVersion, newNodeVersion) {
print("Start up a two-node " + replSetVersion + " replica set.");
var rst = new ReplSetTest({name: name, nodes: nodes});
rst.startSet();
- rst.initiate();
+ var config = rst.getReplSetConfig();
+ // Set protocol version to 0 for 3.2 replset.
+ if (replSetVersion == newVersion) {
+ config.protocolVersion = 0;
+ }
+ rst.initiate(config);
// Wait for a primary node.
var primary = rst.getPrimary();
diff --git a/jstests/multiVersion/mixed_storage_version_replication.js b/jstests/multiVersion/mixed_storage_version_replication.js
index 888b4465389..a3a6f36c520 100644
--- a/jstests/multiVersion/mixed_storage_version_replication.js
+++ b/jstests/multiVersion/mixed_storage_version_replication.js
@@ -612,7 +612,8 @@ function doMultiThreadedWork(primary, numThreads) {
// Make sure everyone is syncing from the primary, to ensure we have all combinations of
// primary/secondary syncing.
config.settings = {chainingAllowed: false};
- replTest.initiate();
+ config.protocolVersion = 0;
+ replTest.initiate(config);
// Ensure all are synced.
replTest.awaitSecondaryNodes(120000);
var primary = replTest.getPrimary();
diff --git a/jstests/multiVersion/upgrade_downgrade_mongod.js b/jstests/multiVersion/upgrade_downgrade_mongod.js
index 244ea79d71e..35c93318d5e 100644
--- a/jstests/multiVersion/upgrade_downgrade_mongod.js
+++ b/jstests/multiVersion/upgrade_downgrade_mongod.js
@@ -258,7 +258,9 @@
function init_replication(conn){
var testDB = conn.getDB('test');
var testName = this.name;
- var rsconf = {_id: 'oplog', members: [ {_id: 0, host: 'localhost:' + conn.port}]};
+ var rsconf = {_id: 'oplog',
+ members: [ {_id: 0, host: 'localhost:' + conn.port}],
+ protocolVersion: 0};
assert.commandWorked(testDB.adminCommand({replSetInitiate : rsconf}),
testName + ' replSetInitiate');
diff --git a/jstests/multiVersion/wt_index_option_defaults_replset.js b/jstests/multiVersion/wt_index_option_defaults_replset.js
index a5c9c2cb248..451c56f807c 100644
--- a/jstests/multiVersion/wt_index_option_defaults_replset.js
+++ b/jstests/multiVersion/wt_index_option_defaults_replset.js
@@ -24,6 +24,7 @@
// Rig the election so that the 3.2 node becomes the primary.
var replSetConfig = rst.getReplSetConfig();
replSetConfig.members[1].priority = 0;
+ replSetConfig.protocolVersion = 0;
rst.initiate(replSetConfig);
diff --git a/jstests/noPassthrough/initial_sync_cloner_dups.js b/jstests/noPassthrough/initial_sync_cloner_dups.js
index 554f88e1ca5..602b6af9f4b 100644
--- a/jstests/noPassthrough/initial_sync_cloner_dups.js
+++ b/jstests/noPassthrough/initial_sync_cloner_dups.js
@@ -75,6 +75,10 @@ jsTestLog("add a new secondary");
var secondary = replTest.add({});
replTest.reInitiate(4*60*1000);
secondary.setSlaveOk();
+// Wait for the secondary to get ReplSetInitiate command.
+replTest.waitForState(secondary,
+ [replTest.STARTUP2, replTest.RECOVERING, replTest.SECONDARY],
+ 60 * 1000);
// This fail point will cause the first intial sync to fail, and leave an op in the buffer to
// verify the fix from SERVER-17807
diff --git a/jstests/noPassthroughWithMongod/ttl_repl.js b/jstests/noPassthroughWithMongod/ttl_repl.js
index 791dc217b44..f56134f5008 100644
--- a/jstests/noPassthroughWithMongod/ttl_repl.js
+++ b/jstests/noPassthroughWithMongod/ttl_repl.js
@@ -5,6 +5,8 @@
* Part 3: Change the TTL expireAfterSeconds field and check successful propogation to secondary.
*/
+load("jstests/replsets/rslib.js");
+
var rt = new ReplSetTest( { name : "ttl_repl" , nodes: 2 } );
/******** Part 1 ***************/
@@ -64,8 +66,9 @@ assert.eq( 6 , slave1col.count() , "docs not deleted on secondary" );
// add a new secondary, wait for it to fully join
var slave = rt.add();
-rt.reInitiate();
-rt.awaitSecondaryNodes();
+var config = rt.getReplSetConfig();
+config.version = 2;
+reconfig(rt, config);
var slave2col = slave.getDB( 'd' )[ 'c' ];
diff --git a/jstests/replsets/bulk_api_wc.js b/jstests/replsets/bulk_api_wc.js
index 05f28d573ab..86348943644 100644
--- a/jstests/replsets/bulk_api_wc.js
+++ b/jstests/replsets/bulk_api_wc.js
@@ -4,7 +4,7 @@
jsTest.log("Starting bulk api write concern tests...");
-// Start a single-node replica set with no journal
+// Start a 2-node replica set with no journal
//Allows testing immediate write concern failures and wc application failures
var rst = new ReplSetTest({ nodes : 2 });
rst.startSet({ nojournal : "" });
diff --git a/jstests/replsets/election_not_blocked.js b/jstests/replsets/election_not_blocked.js
index f15efa1635b..20c2ff7cc59 100644
--- a/jstests/replsets/election_not_blocked.js
+++ b/jstests/replsets/election_not_blocked.js
@@ -20,7 +20,8 @@
{_id: 1, host: host+":"+port[1]},
{_id: 2, host: host+":"+port[2], hidden: true, priority: 0},
],
- // vetos only exist in protocol version 0, so we use PV0 explicitly here.
+ // In PV1, a voter writes the last vote to disk before granting the vote,
+ // so it cannot vote while fsync locked in PV1. Use PV0 explicitly here.
protocolVersion: 0});
replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
var master = replTest.getMaster();
diff --git a/jstests/replsets/initial_sync1.js b/jstests/replsets/initial_sync1.js
index f55ae0b4910..a3ecaf5db68 100644
--- a/jstests/replsets/initial_sync1.js
+++ b/jstests/replsets/initial_sync1.js
@@ -20,7 +20,7 @@ print("1. Bring up set");
// SERVER-7455, this test is called from ssl/auth_x509.js
var x509_options1;
var x509_options2;
-var replTest = new ReplSetTest({name: basename,
+var replTest = new ReplSetTest({name: basename,
nodes : {node0 : x509_options1, node1 : x509_options2}});
var conns = replTest.startSet();
@@ -61,7 +61,7 @@ var admin_s2 = slave2.getDB("admin");
var config = replTest.getReplSetConfig();
config.version = 2;
-config.members.push({_id:2, host:hostname+":"+slave2.port});
+config.members.push({_id:2, host: slave2.host});
try {
admin.runCommand({replSetReconfig:config});
}
@@ -82,37 +82,20 @@ wait(function() {
(config3 && config3.version == config.version);
});
-wait(function() {
- var status = admin_s2.runCommand({replSetGetStatus:1});
- printjson(status);
- return status.members &&
- (status.members[2].state == 3 || status.members[2].state == 2);
- });
+replTest.waitForState(slave2, [replTest.SECONDARY, replTest.RECOVERING], 60 * 1000);
+print("7. Kill the secondary in the middle of syncing");
+replTest.stop(slave1);
-print("7. Kill #2 in the middle of syncing");
-replTest.stop(1);
-
-print("8. Eventually it should become a secondary");
+print("8. Eventually the new node should become a secondary");
print("if initial sync has started, this will cause it to fail and sleep for 5 minutes");
-wait(function() {
- var status = admin_s2.runCommand({replSetGetStatus:1});
- occasionally(function() { printjson(status); });
- return status.members[2].state == 2;
- }, 350);
+replTest.waitForState(slave2, replTest.SECONDARY, 60 * 1000);
-
-print("9. Bring #2 back up");
-replTest.start(1, {}, true);
+print("9. Bring the secondary back up");
+replTest.start(slave1, {}, true);
reconnect(slave1);
-wait(function() {
- var status = admin_s1.runCommand({replSetGetStatus:1});
- printjson(status);
- return status.ok === 1 && status.members && status.members.length >= 2 &&
- (status.members[1].state === 2 || status.members[1].state === 1);
- });
-
+replTest.waitForState(slave1, [replTest.PRIMARY, replTest.SECONDARY], 60 * 1000);
print("10. Insert some stuff");
master = replTest.getMaster();
diff --git a/jstests/replsets/initial_sync2.js b/jstests/replsets/initial_sync2.js
index 1e519048fae..03cf5b4e6f2 100644
--- a/jstests/replsets/initial_sync2.js
+++ b/jstests/replsets/initial_sync2.js
@@ -147,27 +147,7 @@ for (var i=0; i<10000; i++) {
print("12. Everyone happy eventually");
-// if 3 is master...
-if (master+"" != origMaster+"") {
- print("3 is master");
- slave2 = origMaster;
-}
-
-wait(function() {
- var op1 = getLatestOp(master);
- var op2 = getLatestOp(slave1);
- var op3 = getLatestOp(slave2);
-
- occasionally(function() {
- print("latest ops:");
- printjson(op1);
- printjson(op2);
- printjson(op3);
- });
-
- return friendlyEqual(getLatestOp(master), getLatestOp(slave1)) &&
- friendlyEqual(getLatestOp(master), getLatestOp(slave2));
- });
+replTest.awaitReplication();
replTest.stopSet();
};
diff --git a/jstests/replsets/maintenance.js b/jstests/replsets/maintenance.js
index 506e885e0c4..34c0e83993b 100644
--- a/jstests/replsets/maintenance.js
+++ b/jstests/replsets/maintenance.js
@@ -2,7 +2,10 @@
var replTest = new ReplSetTest( {name: 'unicomplex', nodes: 2} );
var conns = replTest.startSet({ verbose: 1 });
-replTest.initiate();
+var config = replTest.getReplSetConfig();
+config.members[0].priority = 2;
+replTest.initiate(config);
+replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60000);
// Make sure we have a master
var master = replTest.getMaster();
diff --git a/jstests/replsets/oplog_note_cmd.js b/jstests/replsets/oplog_note_cmd.js
index 25e60e0a94c..4a501211cd6 100644
--- a/jstests/replsets/oplog_note_cmd.js
+++ b/jstests/replsets/oplog_note_cmd.js
@@ -12,7 +12,7 @@ db.foo.insert({a:1});
var statusBefore = db.runCommand({replSetGetStatus: 1});
assert.commandWorked(db.runCommand({appendOplogNote: 1, data: {a: 1}}));
var statusAfter = db.runCommand({replSetGetStatus: 1});
-assert.lt(statusBefore.members[0].optime, statusAfter.members[0].optime);
+assert.lt(statusBefore.members[0].optime.ts, statusAfter.members[0].optime.ts);
// Make sure note written successfully
var op = db.getSiblingDB('local').oplog.rs.find().sort({$natural: -1}).limit(1).next();
diff --git a/jstests/replsets/protocol_version_upgrade_downgrade.js b/jstests/replsets/protocol_version_upgrade_downgrade.js
index 801eb9d0956..34928b4adc6 100644
--- a/jstests/replsets/protocol_version_upgrade_downgrade.js
+++ b/jstests/replsets/protocol_version_upgrade_downgrade.js
@@ -37,7 +37,8 @@ assert.writeOK(primaryColl.bar.insert({x: 1}, {writeConcern: {w: 3}}));
// Check optime format in protocol version 0, which is a Timestamp.
var res = primary.adminCommand({replSetGetStatus: 1});
assert.commandWorked(res);
-assert.eq(res.members[0].optime.term, null);
+// Check the optime is a Timestamp { t: ..., i: ...} , not an OpTime { ts: ..., t: ... }
+assert.eq(res.members[0].optime.ts, null);
//
// Upgrade protocol version
@@ -58,7 +59,7 @@ assert.writeOK(primaryColl.bar.insert({x: 2}, {writeConcern: {w: 3}}));
// Check optime format in protocol version 1, which is an object including the term.
res = primary.adminCommand({replSetGetStatus: 1});
assert.commandWorked(res);
-assert.eq(res.members[0].optime.term, NumberLong(0));
+assert.eq(res.members[0].optime.t, NumberLong(0));
//
// Downgrade protocol version
@@ -76,6 +77,6 @@ assert.writeOK(primaryColl.bar.insert({x: 3}, {writeConcern: {w: 3}}));
// Check optime format in protocol version 0, which is a Timestamp.
res = primary.adminCommand({replSetGetStatus: 1});
assert.commandWorked(res);
-assert.eq(res.members[0].optime.term, null);
+assert.eq(res.members[0].optime.ts, null);
})();
diff --git a/jstests/replsets/read_after_optime.js b/jstests/replsets/read_after_optime.js
index cb19940ee05..c73ab4574a8 100644
--- a/jstests/replsets/read_after_optime.js
+++ b/jstests/replsets/read_after_optime.js
@@ -14,15 +14,15 @@ var runTest = function(testDB, primaryConn) {
var localDB = primaryConn.getDB('local');
- var oplogTS = localDB.oplog.rs.find().sort({ $natural: -1 }).limit(1).next().ts;
- var twoSecTS = new Timestamp(oplogTS.getTime() + 2, 0);
+ var oplogTS = localDB.oplog.rs.find().sort({ $natural: -1 }).limit(1).next();
+ var twoSecTS = new Timestamp(oplogTS.ts.getTime() + 2, 0);
// Test timeout with maxTimeMS
var res = assert.commandFailed(testDB.runCommand({
find: 'user',
filter: { x: 1 },
readConcern: {
- afterOpTime: { ts: twoSecTS, t: 0 }
+ afterOpTime: { ts: twoSecTS, t: oplogTS.t }
},
maxTimeMS: 1000
}));
@@ -40,7 +40,7 @@ var runTest = function(testDB, primaryConn) {
find: 'user',
filter: { x: 1 },
readConcern: {
- afterOpTime: { ts: twoSecTS, t: 0 },
+ afterOpTime: { ts: twoSecTS, t: oplogTS.t },
maxTimeMS: 10 * 1000
}
}));
diff --git a/jstests/replsets/remove1.js b/jstests/replsets/remove1.js
index ca2055bf566..b70de7c257d 100644
--- a/jstests/replsets/remove1.js
+++ b/jstests/replsets/remove1.js
@@ -17,6 +17,7 @@ var replTest = new ReplSetTest( {name: name, nodes: 2} );
var nodes = replTest.startSet();
replTest.initiate();
var master = replTest.getMaster();
+var secondary = replTest.getSecondary();
print("Initial sync");
master.getDB("foo").bar.baz.insert({x:1});
@@ -25,11 +26,17 @@ replTest.awaitReplication();
print("Remove secondary");
var config = replTest.getReplSetConfig();
-
-config.members.pop();
+for (var i = 0; i < config.members.length; i++) {
+ if (config.members[i].host == secondary.host) {
+ config.members.splice(i, 1);
+ break;
+ }
+};
config.version = 2;
-assert.eq(replTest.nodes[1].getDB("admin").runCommand({ping:1}).ok, 1, "we are connected to node[1]");
+assert.eq(secondary.getDB("admin").runCommand({ping:1}).ok,
+ 1,
+ "we should be connected to the secondary");
try {
master.getDB("admin").runCommand({replSetReconfig:config});
@@ -38,11 +45,11 @@ catch(e) {
print(e);
}
-// This test that nodes[1] disconnects us when it picks up the new config
+// This tests that the secondary disconnects us when it picks up the new config.
assert.soon(
function() {
try {
- replTest.nodes[1].getDB("admin").runCommand({ping:1});
+ secondary.getDB("admin").runCommand({ping:1});
} catch (e) {
return true;
}
@@ -50,9 +57,9 @@ assert.soon(
}
);
-// Now we should successfully reconnect to nodes[1]
-assert.eq(replTest.nodes[1].getDB("admin").runCommand({ping:1}).ok, 1,
- "we are connected to node[1]");
+// Now we should successfully reconnect to the secondary.
+assert.eq(secondary.getDB("admin").runCommand({ping:1}).ok, 1,
+ "we aren't connected to the secondary");
reconnect(master);
@@ -62,7 +69,7 @@ assert.soon(function() {
});
print("Add it back as a secondary");
-config.members.push({_id:1, host : host+":"+replTest.getPort(1)});
+config.members.push({_id:2, host : secondary.host});
config.version = 3;
printjson(config);
wait(function() {
@@ -105,7 +112,7 @@ wait(function() {
} , "wait2" );
print("reconfig with minority");
-replTest.stop(1);
+replTest.stop(secondary);
assert.soon(function() {
try {
diff --git a/jstests/replsets/replset1.js b/jstests/replsets/replset1.js
index 4688b8d7e04..6a4b1063de9 100644
--- a/jstests/replsets/replset1.js
+++ b/jstests/replsets/replset1.js
@@ -132,7 +132,8 @@ var doTest = function( signal ) {
printjson(result);
var lastOp = result.lastOp;
var lastOplogOp = master.getDB("local").oplog.rs.find().sort({$natural : -1}).limit(1).next();
- assert.eq(lastOplogOp['ts'], lastOp);
+ assert.eq(lastOplogOp['ts'], lastOp['ts']);
+ assert.eq(lastOplogOp['t'], lastOp['t']);
ts.forEach( function(z){ assert.eq( 2 , z.getIndexKeys().length , "A " + z.getMongo() ); } );
diff --git a/jstests/replsets/tags.js b/jstests/replsets/tags.js
index 2a1f77608a6..f58e255b53a 100644
--- a/jstests/replsets/tags.js
+++ b/jstests/replsets/tags.js
@@ -164,6 +164,9 @@ replTest.partition(2, 0);
replTest.partition(2, 1);
replTest.stop(2);
+// Node 1 with slightly higher priority will take over.
+replTest.waitForState(nodes[1], replTest.PRIMARY, 60 * 1000);
+
myprint("1 must become primary here because otherwise the other members will take too long " +
"timing out their old sync threads");
master = replTest.getMaster();
diff --git a/jstests/sharding/csrs_upgrade_during_migrate.js b/jstests/sharding/csrs_upgrade_during_migrate.js
index 0d717cb7554..1f0da2dc34d 100644
--- a/jstests/sharding/csrs_upgrade_during_migrate.js
+++ b/jstests/sharding/csrs_upgrade_during_migrate.js
@@ -36,9 +36,13 @@ var st;
var addSlaveDelay = function(rst) {
var conf = rst.getMaster().getDB('local').system.replset.findOne();
conf.version++;
- conf.members[1].priority = 0;
- conf.members[1].hidden = true;
- conf.members[1].slaveDelay = 30;
+ var secondaryIndex = 0;
+ if (conf.members[secondaryIndex].host === rst.getMaster().host) {
+ secondaryIndex = 1;
+ }
+ conf.members[secondaryIndex].priority = 0;
+ conf.members[secondaryIndex].hidden = true;
+ conf.members[secondaryIndex].slaveDelay = 30;
reconfig(rst, conf);
}
@@ -92,9 +96,6 @@ var st;
version: 1,
configsvr: true,
members: [ { _id: 0, host: st.c0.name }],
- settings: {
- protocolVersion :1
- }
};
assert.commandWorked(st.c0.adminCommand({replSetInitiate: csrsConfig}));
var csrs = [];
diff --git a/jstests/sharding/diffservers1.js b/jstests/sharding/diffservers1.js
index 0d477147be8..f2c16664398 100644
--- a/jstests/sharding/diffservers1.js
+++ b/jstests/sharding/diffservers1.js
@@ -1,7 +1,6 @@
var s = new ShardingTest( "diffservers1" , 2 );
assert.eq( 2 , s.config.shards.count() , "server count wrong" );
-assert.eq( 2 , s._configServers[0].getDB( "config" ).shards.count() , "where are servers!" );
assert.eq( 0 , s._shardServers[0].getDB( "config" ).shards.count() , "shouldn't be here" );
assert.eq( 0 , s._shardServers[1].getDB( "config" ).shards.count() , "shouldn't be here" );
diff --git a/jstests/slow1/replsets_priority1.js b/jstests/slow1/replsets_priority1.js
index db28539ebe4..c9ec08fd78f 100644
--- a/jstests/slow1/replsets_priority1.js
+++ b/jstests/slow1/replsets_priority1.js
@@ -33,7 +33,7 @@ var everyoneOkSoon = function() {
var checkPrimaryIs = function (node) {
- print("nreplsets_priority1.js checkPrimaryIs(" + node + ")");
+ print("nreplsets_priority1.js checkPrimaryIs(" + node.host + ")");
var status;
diff --git a/jstests/tool/dumprestore10.js b/jstests/tool/dumprestore10.js
index f59b131bb05..858032827a7 100644
--- a/jstests/tool/dumprestore10.js
+++ b/jstests/tool/dumprestore10.js
@@ -33,7 +33,7 @@ step("mongodump from replset");
var data = MongoRunner.dataDir + "/dumprestore10-dump1/";
-runMongoProgram( "mongodump", "--host", "127.0.0.1:"+replTest.ports[0], "--out", data );
+runMongoProgram( "mongodump", "--host", "127.0.0.1:"+master.port, "--out", data );
{
@@ -48,7 +48,7 @@ runMongoProgram( "mongodump", "--host", "127.0.0.1:"+replTest.ports[0], "--out",
step("try mongorestore with write concern");
-runMongoProgram( "mongorestore", "--writeConcern", "2", "--host", "127.0.0.1:"+replTest.ports[0], "--dir", data );
+runMongoProgram( "mongorestore", "--writeConcern", "2", "--host", "127.0.0.1:"+master.port, "--dir", data );
var x = 0;