summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjstests/replsets/two_initsync.js2
-rw-r--r--src/mongo/shell/replsettest.js5
2 files changed, 4 insertions, 3 deletions
diff --git a/jstests/replsets/two_initsync.js b/jstests/replsets/two_initsync.js
index 7d1442d344f..08e440406cb 100755
--- a/jstests/replsets/two_initsync.js
+++ b/jstests/replsets/two_initsync.js
@@ -63,7 +63,7 @@ doTest = function (signal) {
// Add the second node.
// This runs the equivalent of rs.add(newNode);
- replTest.reInitiate();
+ replTest.reInitiate(60000);
var b = second.getDB("admin");
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index aa60b390f1b..f54cc8db09b 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -458,12 +458,13 @@ ReplSetTest.prototype.initiate = function( cfg , initCmd , timeout ) {
}
}
-ReplSetTest.prototype.reInitiate = function() {
+ReplSetTest.prototype.reInitiate = function(timeout) {
var master = this.nodes[0];
var c = master.getDB("local")['system.replset'].findOne();
var config = this.getReplSetConfig();
+ var timeout = timeout || 30000;
config.version = c.version + 1;
- this.initiate( config , 'replSetReconfig' );
+ this.initiate( config , 'replSetReconfig', timeout );
}
ReplSetTest.prototype.getLastOpTimeWritten = function() {