SERVER-21050 Cleanup ReplSetTest

This is just a cleanup work to hide some of the private state of
ReplSetTest so it is easier to encapsulate and add new logic. Also enables
strict mode.

82 files changed, 154 insertions, 154 deletions

diff --git a/jstests/replsets/apply_batch_only_goes_forward.js b/jstests/replsets/apply_batch_only_goes_forward.js
index 7786be9cc4f..8abbb693fe0 100644
--- a/jstests/replsets/apply_batch_only_goes_forward.js
+++ b/jstests/replsets/apply_batch_only_goes_forward.js
@@ -25,7 +25,7 @@
 
     var nodes = replTest.startSet();
     replTest.initiate();
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var mTest = master.getDB("test");
     var mLocal = master.getDB("local");
     var mMinvalid = mLocal["replset.minvalid"];
@@ -66,7 +66,7 @@
     replTest.waitForState(master, replTest.RECOVERING, 90000);
 
     // Slave is now master... so do a write to get a minvalid entry on the secondary.
-    assert.writeOK(replTest.getMaster().getDB("test").foo.save({}, {writeConcern: {w: 3}}));
+    assert.writeOK(replTest.getPrimary().getDB("test").foo.save({}, {writeConcern: {w: 3}}));
 
     assert.soon(function() {
         var mv;
diff --git a/jstests/replsets/auth1.js b/jstests/replsets/auth1.js
index 939b1d90e22..fc0eb463fbf 100644
--- a/jstests/replsets/auth1.js
+++ b/jstests/replsets/auth1.js
@@ -59,7 +59,7 @@ result = m.getDB("admin").runCommand({replSetInitiate : rs.getReplSetConfig()});
 assert.eq(result.ok, 1, "couldn't initiate: "+tojson(result));
 m.getDB('admin').logout(); // In case this node doesn't become primary, make sure its not auth'd
 
-var master = rs.getMaster();
+var master = rs.getPrimary();
 rs.awaitSecondaryNodes();
 var mId = rs.getNodeId(master);
 var slave = rs.liveNodes.slaves[0];
@@ -107,7 +107,7 @@ assert.writeOK(bulk.execute({ w: 3, wtimeout: 60000 }));
 print("fail over");
 rs.stop(mId);
 
-master = rs.getMaster();
+master = rs.getPrimary();
 
 print("add some more data 1");
 master.getDB("test").auth("bar", "baz");
@@ -119,7 +119,7 @@ assert.writeOK(bulk.execute({ w: 2 }));
 
 print("resync");
 rs.restart(mId, {"keyFile" : key1_600});
-master = rs.getMaster();
+master = rs.getPrimary();
 
 print("add some more data 2");
 bulk = master.getDB("test").foo.initializeUnorderedBulkOp();
@@ -146,7 +146,7 @@ try {
 catch (e) {
     print("error: "+e);
 }
-master = rs.getMaster();
+master = rs.getPrimary();
 master.getDB("admin").auth("foo", "bar");
 
 
diff --git a/jstests/replsets/auth2.js b/jstests/replsets/auth2.js
index 8899162d04e..62179c1c7af 100644
--- a/jstests/replsets/auth2.js
+++ b/jstests/replsets/auth2.js
@@ -39,7 +39,7 @@ rs.initiate({ "_id" : name,
                         {"_id" : 2, "host" : hostnames[2], priority: 0}
                     ]});
 
-var master = rs.getMaster();
+var master = rs.getPrimary();
 
 print("add an admin user");
 master.getDB("admin").createUser({user: "foo", pwd: "bar", roles: jsTest.adminUserRoles},
diff --git a/jstests/replsets/auth3.js b/jstests/replsets/auth3.js
index d940c5e3e37..504bfeffe9c 100644
--- a/jstests/replsets/auth3.js
+++ b/jstests/replsets/auth3.js
@@ -19,13 +19,13 @@
     rs.startSet();
     rs.initiate();
 
-    master = rs.getMaster();
+    master = rs.getPrimary();
     jsTest.log("adding user");
     master.getDB("admin").createUser({user: "foo", pwd: "bar", roles: jsTest.adminUserRoles},
                                      {w: 2, wtimeout: 30000});
 
     var safeInsert = function() {
-        master = rs.getMaster();
+        master = rs.getPrimary();
         master.getDB("admin").auth("foo", "bar");
         assert.writeOK(master.getDB("foo").bar.insert({ x: 1 }));
     };
@@ -44,7 +44,7 @@
     jsTest.log("write stuff to 0&2");
     rs.stop(1);
 
-    master = rs.getMaster();
+    master = rs.getPrimary();
     master.getDB("admin").auth("foo", "bar");
     master.getDB("foo").bar.drop();
     jsTest.log("last op: " +
diff --git a/jstests/replsets/auth_no_pri.js b/jstests/replsets/auth_no_pri.js
index 71c976586d7..59eefa52f52 100644
--- a/jstests/replsets/auth_no_pri.js
+++ b/jstests/replsets/auth_no_pri.js
@@ -6,7 +6,7 @@ var nodes = rs.startSet();
 rs.initiate();
 
 // Add user
-var master = rs.getMaster();
+var master = rs.getPrimary();
 master.getDB("admin").createUser({user: "admin", pwd: "pwd", roles: ["root"]}, {w: NODE_COUNT});
 
 // Can authenticate replset connection when whole set is up.
diff --git a/jstests/replsets/buildindexes.js b/jstests/replsets/buildindexes.js
index 5ec65765e27..a114011c3a0 100644
--- a/jstests/replsets/buildindexes.js
+++ b/jstests/replsets/buildindexes.js
@@ -15,7 +15,7 @@
   
   replTest.initiate(config);
 
-  var master = replTest.getMaster().getDB(name);
+  var master = replTest.getPrimary().getDB(name);
   var slaveConns = replTest.liveNodes.slaves;
   var slave = [];
   for (var i in slaveConns) {
diff --git a/jstests/replsets/capped_id.js b/jstests/replsets/capped_id.js
index cd866fb0234..83942f6405f 100644
--- a/jstests/replsets/capped_id.js
+++ b/jstests/replsets/capped_id.js
@@ -18,9 +18,9 @@ var nodes = replTest.startSet();
 // This will wait for initiation
 replTest.initiate();
 
-// Call getMaster to return a reference to the node that's been
+// Call getPrimary to return a reference to the node that's been
 // elected master
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 
 // wait for secondaries to be up, since we'll be reading from them
 replTest.awaitSecondaryNodes();
@@ -28,7 +28,7 @@ replTest.awaitSecondaryNodes();
 var slave1 = replTest.liveNodes.slaves[0];
 var slave2 = replTest.liveNodes.slaves[1];
 
-// Calling getMaster made available the liveNodes structure,
+// Calling getPrimary made available the liveNodes structure,
 // which looks like this:
 // liveNodes = {master: masterNode, slaves: [slave1, slave2] }
 printjson( replTest.liveNodes );
diff --git a/jstests/replsets/capped_insert_order.js b/jstests/replsets/capped_insert_order.js
index b55972afc16..9b39021732c 100644
--- a/jstests/replsets/capped_insert_order.js
+++ b/jstests/replsets/capped_insert_order.js
@@ -8,7 +8,7 @@
     replTest.startSet();
     replTest.initiate();
 
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var slave = replTest.liveNodes.slaves[0];
 
     var dbName = "db";
diff --git a/jstests/replsets/cloneDb.js b/jstests/replsets/cloneDb.js
index 54b50d9c63f..ca53d370f4a 100644
--- a/jstests/replsets/cloneDb.js
+++ b/jstests/replsets/cloneDb.js
@@ -21,7 +21,7 @@ if (jsTest.options().keyFile) {
     var replTest = new ReplSetTest({name: 'testSet', nodes: 3});
     replTest.startSet();
     replTest.initiate();
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var secondary = replTest.liveNodes.slaves[0];
     var masterDB = master.getDB(replsetDBName);
     masterDB.dropDatabase();
diff --git a/jstests/replsets/config_server_checks.js b/jstests/replsets/config_server_checks.js
index b7627923d8d..41579aceb89 100644
--- a/jstests/replsets/config_server_checks.js
+++ b/jstests/replsets/config_server_checks.js
@@ -51,7 +51,7 @@ var conf = rst.getReplSetConfig();
 conf.configsvr = true;
 assert.commandWorked(rst.nodes[0].adminCommand({replSetInitiate: conf}));
 
-rst.getMaster();
+rst.getPrimary();
 expectState(rst, rst.PRIMARY);
 rst.stopSet();
 })();
@@ -71,10 +71,10 @@ var conf = rst.getReplSetConfig();
 conf.configsvr = true;
 assert.commandWorked(rst.nodes[0].adminCommand({replSetInitiate: conf}));
 
-rst.getMaster();
+rst.getPrimary();
 expectState(rst, rst.PRIMARY);
 
-var conf = rst.getMaster().getDB('local').system.replset.findOne();
+var conf = rst.getPrimary().getDB('local').system.replset.findOne();
 assert(conf.configsvr, tojson(conf));
 
 rst.stopSet();
@@ -93,7 +93,7 @@ var rst = new ReplSetTest({name: "configrs6",
 rst.startSet();
 assert.commandWorked(rst.nodes[0].adminCommand({replSetInitiate: 1}));
 
-rst.getMaster();
+rst.getPrimary();
 expectState(rst, rst.PRIMARY);
 rst.stopSet();
 })();
@@ -111,7 +111,7 @@ rst.startSet();
 var conf = rst.getReplSetConfig();
 assert.commandWorked(rst.nodes[0].adminCommand({replSetInitiate: conf}));
 
-rst.getMaster();
+rst.getPrimary();
 expectState(rst, rst.PRIMARY);
 assert.throws(function() {
                   rst.restart(0, {configsvr: ""});
@@ -135,7 +135,7 @@ var conf = rst.getReplSetConfig();
 conf.configsvr = true;
 assert.commandWorked(rst.nodes[0].adminCommand({replSetInitiate: conf}));
 
-rst.getMaster();
+rst.getPrimary();
 expectState(rst, rst.PRIMARY);
 
 var node = rst.nodes[0];
diff --git a/jstests/replsets/copydb.js b/jstests/replsets/copydb.js
index d3df7de08c2..59730f70084 100644
--- a/jstests/replsets/copydb.js
+++ b/jstests/replsets/copydb.js
@@ -8,7 +8,7 @@
 
     replTest.startSet();
     replTest.initiate();
-    var primary = replTest.getMaster();
+    var primary = replTest.getPrimary();
     var secondary = replTest.liveNodes.slaves[0];
 
     var sourceDBName = 'copydb-repl-test-source';
diff --git a/jstests/replsets/drop_oplog.js b/jstests/replsets/drop_oplog.js
index 90c920e1b27..8a84bb2050e 100644
--- a/jstests/replsets/drop_oplog.js
+++ b/jstests/replsets/drop_oplog.js
@@ -6,7 +6,7 @@
 
     var nodes = rt.startSet();
     rt.initiate();
-    var master = rt.getMaster();
+    var master = rt.getPrimary();
     var ml = master.getDB( 'local' );
 
     var threw = false;
diff --git a/jstests/replsets/election_not_blocked.js b/jstests/replsets/election_not_blocked.js
index 20c2ff7cc59..c3523200b0b 100644
--- a/jstests/replsets/election_not_blocked.js
+++ b/jstests/replsets/election_not_blocked.js
@@ -24,7 +24,7 @@
             // 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();
+    var master = replTest.getPrimary();
 
     // do a write
     assert.writeOK(master.getDB("foo").bar.insert({x:1}, {writeConcern: {w: 3}}));
diff --git a/jstests/replsets/explain_slaveok.js b/jstests/replsets/explain_slaveok.js
index 0714c5074d1..93069e6ac01 100644
--- a/jstests/replsets/explain_slaveok.js
+++ b/jstests/replsets/explain_slaveok.js
@@ -12,7 +12,7 @@ print("Start replica set with two nodes");
 var replTest = new ReplSetTest({name: name, nodes: 2});
 var nodes = replTest.startSet();
 replTest.initiate();
-var primary = replTest.getMaster();
+var primary = replTest.getPrimary();
 
 // Insert a document and let it sync to the secondary.
 print("Initial sync");
diff --git a/jstests/replsets/fsync_lock_read_secondaries.js b/jstests/replsets/fsync_lock_read_secondaries.js
index 3f55bc8ef8b..81f6a0be8ae 100644
--- a/jstests/replsets/fsync_lock_read_secondaries.js
+++ b/jstests/replsets/fsync_lock_read_secondaries.js
@@ -31,7 +31,7 @@ var replTest = new ReplSetTest({name: 'testSet', nodes: 2, oplogSize: 5});
 var nodes = replTest.startSet();
 // This will wait for initiation
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 
 var ret = master.getDB("admin").fsyncLock();
 if (!ret.ok) {
@@ -48,7 +48,7 @@ for(var i=0; i<docNum; i++) {
 waitForAllMembers(master.getDB("foo"));
 replTest.awaitReplication();
 
-// Calling getMaster also makes available the liveNodes structure, which looks like this:
+// Calling getPrimary also makes available the liveNodes structure, which looks like this:
 // liveNodes = {master: masterNode, slaves: [slave1, slave2] }
 var slaves = replTest.liveNodes.slaves;
 slaves[0].setSlaveOk();
diff --git a/jstests/replsets/groupAndMapReduce.js b/jstests/replsets/groupAndMapReduce.js
index a60ce82f5f8..1aff25a18eb 100644
--- a/jstests/replsets/groupAndMapReduce.js
+++ b/jstests/replsets/groupAndMapReduce.js
@@ -18,9 +18,9 @@ doTest = function( signal ) {
     // This will wait for initiation
     replTest.initiate();
 
-    // Call getMaster to return a reference to the node that's been
+    // Call getPrimary to return a reference to the node that's been
     // elected master.
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
 
     // save some records
     var len = 100
diff --git a/jstests/replsets/index_delete.js b/jstests/replsets/index_delete.js
index c2e871fe6f1..8747eacc412 100644
--- a/jstests/replsets/index_delete.js
+++ b/jstests/replsets/index_delete.js
@@ -39,7 +39,7 @@ replTest.initiate({"_id" : "fgIndex",
                        {"_id" : 1, "host" : nodes[1]},
                        {"_id" : 2, "host" : nodes[2], "arbiterOnly" : true}]});
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var second = replTest.getSecondary();
 var masterDB = master.getDB('fgIndexSec');
 var secondDB = second.getDB('fgIndexSec');
diff --git a/jstests/replsets/index_restart_secondary.js b/jstests/replsets/index_restart_secondary.js
index d792839c580..7308de83271 100644
--- a/jstests/replsets/index_restart_secondary.js
+++ b/jstests/replsets/index_restart_secondary.js
@@ -24,7 +24,7 @@ if (conns[0].getDB('test').serverBuildInfo().bits !== 32) {
                            {"_id" : 1, "host" : nodes[1]},
                            {"_id" : 2, "host" : nodes[2], "arbiterOnly" : true}]});
 
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var second = replTest.getSecondary();
 
     var secondId = replTest.getNodeId(second);
diff --git a/jstests/replsets/initial_sync1.js b/jstests/replsets/initial_sync1.js
index a3ecaf5db68..8b673117fd1 100644
--- a/jstests/replsets/initial_sync1.js
+++ b/jstests/replsets/initial_sync1.js
@@ -26,7 +26,7 @@ var replTest = new ReplSetTest({name: basename,
 var conns = replTest.startSet();
 replTest.initiate();
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var foo = master.getDB("foo");
 var admin = master.getDB("admin");
 
@@ -98,7 +98,7 @@ reconnect(slave1);
 replTest.waitForState(slave1, [replTest.PRIMARY, replTest.SECONDARY], 60 * 1000);
 
 print("10. Insert some stuff");
-master = replTest.getMaster();
+master = replTest.getPrimary();
 bulk = foo.bar.initializeUnorderedBulkOp();
 for (var i = 0; i < 100; i++) {
   bulk.insert({ date: new Date(), x: i, str: "all the talk on the market" });
diff --git a/jstests/replsets/initial_sync2.js b/jstests/replsets/initial_sync2.js
index 7888f7d3354..9a913aeafc5 100644
--- a/jstests/replsets/initial_sync2.js
+++ b/jstests/replsets/initial_sync2.js
@@ -25,7 +25,7 @@ var replTest = new ReplSetTest( {name: basename, nodes: 2} );
 var conns = replTest.startSet();
 replTest.initiate();
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var origMaster = master;
 var foo = master.getDB("foo");
 var admin = master.getDB("admin");
diff --git a/jstests/replsets/initial_sync3.js b/jstests/replsets/initial_sync3.js
index b7446813004..4456cfbd498 100644
--- a/jstests/replsets/initial_sync3.js
+++ b/jstests/replsets/initial_sync3.js
@@ -27,7 +27,7 @@ replTest.initiate({
     ]
 });
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 
 print("Initial sync");
 master.getDB("foo").bar.baz.insert({x:1});
@@ -48,7 +48,7 @@ assert(!result.secondary, tojson(result));
 print("bring 0 back up");
 replTest.restart(0);
 print("0 should become primary");
-master = replTest.getMaster();
+master = replTest.getPrimary();
 
 print("now 1 should be able to initial sync");
 assert.soon(function() {
diff --git a/jstests/replsets/initial_sync4.js b/jstests/replsets/initial_sync4.js
index da49839ef0c..c7c23e65497 100644
--- a/jstests/replsets/initial_sync4.js
+++ b/jstests/replsets/initial_sync4.js
@@ -8,7 +8,7 @@ replTest = new ReplSetTest( {name: basename, nodes: 1} );
 replTest.startSet();
 replTest.initiate();
 
-m = replTest.getMaster();
+m = replTest.getPrimary();
 md = m.getDB("d");
 mc = m.getDB("d")["c"];
 
diff --git a/jstests/replsets/ismaster1.js b/jstests/replsets/ismaster1.js
index 76252a069cb..1904145c882 100644
--- a/jstests/replsets/ismaster1.js
+++ b/jstests/replsets/ismaster1.js
@@ -116,7 +116,7 @@ var agreeOnPrimaryAndSetVersion = function( setVersion ) {
     return true;
 }
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert.soon( function() { return agreeOnPrimaryAndSetVersion( 1 ); },
              "Nodes did not initiate in less than a minute", 60000 );
 
@@ -199,7 +199,7 @@ catch(e) {
     print(e);
 }
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert.soon( function() { return agreeOnPrimaryAndSetVersion( 2 ); },
              "Nodes did not sync in less than a minute", 60000 );
 
diff --git a/jstests/replsets/maintenance.js b/jstests/replsets/maintenance.js
index 34c0e83993b..5ecc15456dc 100644
--- a/jstests/replsets/maintenance.js
+++ b/jstests/replsets/maintenance.js
@@ -8,7 +8,7 @@ replTest.initiate(config);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60000);
 
 // Make sure we have a master
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 
 for (i = 0; i < 20; i++) {
     master.getDB("bar").foo.insert({x:1,y:i,abc:123,str:"foo bar baz"});
diff --git a/jstests/replsets/maintenance2.js b/jstests/replsets/maintenance2.js
index 9b2793a3bd9..401bfeb8701 100644
--- a/jstests/replsets/maintenance2.js
+++ b/jstests/replsets/maintenance2.js
@@ -15,9 +15,9 @@
     // This will wait for initiation
     replTest.initiate();
 
-    // Call getMaster to return a reference to the node that's been
+    // Call getPrimary to return a reference to the node that's been
     // elected master.
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
 
     // save some records
     var len = 100
diff --git a/jstests/replsets/maxSyncSourceLagSecs.js b/jstests/replsets/maxSyncSourceLagSecs.js
index 087db2edaab..8d44dd5ddb2 100644
--- a/jstests/replsets/maxSyncSourceLagSecs.js
+++ b/jstests/replsets/maxSyncSourceLagSecs.js
@@ -18,7 +18,7 @@
                            { "_id": 2, "host": nodes[2], priority: 0 }],
                       });
 
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     master.getDB("foo").bar.save({a: 1});
     replTest.awaitReplication();
     var slaves = replTest.liveNodes.slaves;
diff --git a/jstests/replsets/no_chaining.js b/jstests/replsets/no_chaining.js
index ebedae9fa5d..97acc61875a 100644
--- a/jstests/replsets/no_chaining.js
+++ b/jstests/replsets/no_chaining.js
@@ -20,13 +20,13 @@ replTest.initiate(
     }
 );
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 replTest.awaitReplication();
 
 
 var breakNetwork = function() {
     nodes[0].disconnect(nodes[2]);
-    master = replTest.getMaster();
+    master = replTest.getPrimary();
 };
 
 var checkNoChaining = function() {
diff --git a/jstests/replsets/oplog_format.js b/jstests/replsets/oplog_format.js
index c07d4f66cef..c7cc18a5908 100644
--- a/jstests/replsets/oplog_format.js
+++ b/jstests/replsets/oplog_format.js
@@ -9,7 +9,7 @@
 var replTest = new ReplSetTest( { nodes: 1, oplogSize:2, nodeOptions: {smallfiles:""}} );
 var nodes = replTest.startSet();
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var coll = master.getDB("o").fake;
 var cdb = coll.getDB();
 
diff --git a/jstests/replsets/oplog_truncated_on_recovery.js b/jstests/replsets/oplog_truncated_on_recovery.js
index 8142b8df7ee..c9e2fcaeae2 100644
--- a/jstests/replsets/oplog_truncated_on_recovery.js
+++ b/jstests/replsets/oplog_truncated_on_recovery.js
@@ -36,7 +36,7 @@
 
     var nodes = replTest.startSet();
     replTest.initiate();
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var testDB = master.getDB("test");
     var localDB = master.getDB("local");
     var minvalidColl = localDB["replset.minvalid"];
diff --git a/jstests/replsets/optime.js b/jstests/replsets/optime.js
index 647864245dc..5d64719fe8c 100644
--- a/jstests/replsets/optime.js
+++ b/jstests/replsets/optime.js
@@ -32,7 +32,7 @@ var replTest = new ReplSetTest( { name : "replStatus" , nodes: 3, oplogSize: 1 }
 
 replTest.startSet();
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 replTest.awaitReplication();
 replTest.awaitSecondaryNodes();
 
diff --git a/jstests/replsets/pipelineout.js b/jstests/replsets/pipelineout.js
index 5e0c1d7f45c..97accba2eec 100644
--- a/jstests/replsets/pipelineout.js
+++ b/jstests/replsets/pipelineout.js
@@ -10,7 +10,7 @@ replTest.initiate({"_id" : name,
                          {"_id" : 1, "host" : nodes[1]}
      ]});
 
-var primary = replTest.getMaster().getDB(name);
+var primary = replTest.getPrimary().getDB(name);
 var secondary = replTest.liveNodes.slaves[0].getDB(name);
 
 // populate the collection
diff --git a/jstests/replsets/plan_cache_slaveok.js b/jstests/replsets/plan_cache_slaveok.js
index 311efef86bb..a63be51fae1 100644
--- a/jstests/replsets/plan_cache_slaveok.js
+++ b/jstests/replsets/plan_cache_slaveok.js
@@ -81,7 +81,7 @@ print("Start replica set with two nodes");
 var replTest = new ReplSetTest({name: name, nodes: 2});
 var nodes = replTest.startSet();
 replTest.initiate();
-var primary = replTest.getMaster();
+var primary = replTest.getPrimary();
 
 // Insert a document and let it sync to the secondary.
 print("Initial sync");
diff --git a/jstests/replsets/protocol_version_upgrade_downgrade.js b/jstests/replsets/protocol_version_upgrade_downgrade.js
index a5906d2e88d..ebb0a740d7c 100644
--- a/jstests/replsets/protocol_version_upgrade_downgrade.js
+++ b/jstests/replsets/protocol_version_upgrade_downgrade.js
@@ -18,7 +18,7 @@ conf.members[2].priority = 0;
 rst.initiate(conf);
 rst.awaitSecondaryNodes();
 
-var primary = rst.getMaster();
+var primary = rst.getPrimary();
 var primaryColl = primary.getDB("test").coll;
 
 // Set verbosity for replication on all nodes.
diff --git a/jstests/replsets/reindex_secondary.js b/jstests/replsets/reindex_secondary.js
index af08dd4cec8..d3c0991a5d3 100644
--- a/jstests/replsets/reindex_secondary.js
+++ b/jstests/replsets/reindex_secondary.js
@@ -4,7 +4,7 @@ var nodes = replTest.startSet();
 
 replTest.initiate();
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 replTest.awaitSecondaryNodes()
 
 var slaves = replTest.liveNodes.slaves;
diff --git a/jstests/replsets/remove1.js b/jstests/replsets/remove1.js
index 794b9dd9000..e15b793434b 100644
--- a/jstests/replsets/remove1.js
+++ b/jstests/replsets/remove1.js
@@ -16,7 +16,7 @@ print("Start set with two nodes");
 var replTest = new ReplSetTest( {name: name, nodes: 2} );
 var nodes = replTest.startSet();
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var secondary = replTest.getSecondary();
 
 print("Initial sync");
@@ -79,7 +79,7 @@ assert.soon(function() { try {
 } catch (e) {
     return false;
 } });
-master = replTest.getMaster();
+master = replTest.getPrimary();
 printjson(master.getDB("admin").runCommand({replSetGetStatus:1}));
 var newConfig = master.getDB("local").system.replset.findOne();
 print("newConfig: " + tojson(newConfig));
diff --git a/jstests/replsets/replset1.js b/jstests/replsets/replset1.js
index de0fb30df4f..36bc2de74d1 100644
--- a/jstests/replsets/replset1.js
+++ b/jstests/replsets/replset1.js
@@ -25,9 +25,9 @@ var doTest = function( signal ) {
     // This will wait for initiation
     replTest.initiate();
 
-    // Call getMaster to return a reference to the node that's been
+    // Call getPrimary to return a reference to the node that's been
     // elected master.
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
 
     var isPV1 = (replTest.getConfigFromPrimary().protocolVersion == 1);
     if (isPV1) {
@@ -36,7 +36,7 @@ var doTest = function( signal ) {
         assert.eq("new primary", oplog_entry["o"]["msg"]);
         assert.eq("n", oplog_entry["op"]);
     }
-    // Calling getMaster also makes available the liveNodes structure,
+    // Calling getPrimary also makes available the liveNodes structure,
     // which looks like this:
     // liveNodes = {master: masterNode,
     //              slaves: [slave1, slave2]
@@ -68,7 +68,7 @@ var doTest = function( signal ) {
     replTest.stop( master_id );
 
     // Now let's see who the new master is:
-    var new_master = replTest.getMaster();
+    var new_master = replTest.getPrimary();
 
     // Is the new master the same as the old master?
     var new_master_id = replTest.getNodeId( new_master );
@@ -104,7 +104,7 @@ var doTest = function( signal ) {
     });
 
     // And that both slave nodes have all the updates
-    new_master = replTest.getMaster();
+    new_master = replTest.getPrimary();
     assert.eq( 1000 , new_master.getDB( "bar" ).runCommand( { count:"bar"} ).n , "assumption 2");
     replTest.awaitSecondaryNodes();
     replTest.awaitReplication();
@@ -119,7 +119,7 @@ var doTest = function( signal ) {
     });
 
     // last error
-    master = replTest.getMaster();
+    master = replTest.getPrimary();
     slaves = replTest.liveNodes.slaves;
     printjson(replTest.liveNodes);
 
diff --git a/jstests/replsets/replset2.js b/jstests/replsets/replset2.js
index 20364381dd0..656b727ba81 100644
--- a/jstests/replsets/replset2.js
+++ b/jstests/replsets/replset2.js
@@ -18,9 +18,9 @@ doTest = function (signal) {
 
     var testDB = "repl-test";
 
-    // Call getMaster to return a reference to the node that's been
+    // Call getPrimary to return a reference to the node that's been
     // elected master.
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
 
     // Wait for replication to a single node
     master.getDB(testDB).bar.insert({ n: 1 });
diff --git a/jstests/replsets/replset3.js b/jstests/replsets/replset3.js
index 5731e269ce9..6bb29a196ec 100644
--- a/jstests/replsets/replset3.js
+++ b/jstests/replsets/replset3.js
@@ -15,7 +15,7 @@ var doTest = function (signal) {
     replTest.initiate();
 
     // Get master node
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
 
     // Write some data to master
     // NOTE: this test fails unless we write some data.
@@ -35,7 +35,7 @@ var doTest = function (signal) {
     print(phase++);
 
     try {
-        var new_master = replTest.getMaster();
+        var new_master = replTest.getPrimary();
     }
     catch (err) {
         throw ("Could not elect new master before timeout.");
diff --git a/jstests/replsets/replset4.js b/jstests/replsets/replset4.js
index 95fa3dbd543..605284e01da 100644
--- a/jstests/replsets/replset4.js
+++ b/jstests/replsets/replset4.js
@@ -6,7 +6,7 @@ doTest = function (signal) {
     replTest.startSet();
     replTest.initiate();
 
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
 
     // Kill both slaves, simulating a network partition
     var slaves = replTest.liveNodes.slaves;
diff --git a/jstests/replsets/replset5.js b/jstests/replsets/replset5.js
index 3f239499e1b..717a0c8153b 100644
--- a/jstests/replsets/replset5.js
+++ b/jstests/replsets/replset5.js
@@ -19,7 +19,7 @@ load("jstests/replsets/rslib.js");
     replTest.initiate(config);
 
     //
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     replTest.awaitSecondaryNodes();
     var testDB = "foo";
 
diff --git a/jstests/replsets/replset6.js b/jstests/replsets/replset6.js
index f9111e28dbd..1c772cc7c28 100644
--- a/jstests/replsets/replset6.js
+++ b/jstests/replsets/replset6.js
@@ -6,7 +6,7 @@ baseName = "jstests_replsets_replset6";
 var rt = new ReplSetTest({ name : "replset6tests" , nodes: 2 });
 var nodes = rt.startSet();
 rt.initiate();
-var m = rt.getMaster();
+var m = rt.getPrimary();
 rt.awaitSecondaryNodes();
 var slaves = rt.liveNodes.slaves;
 s = slaves[0];
diff --git a/jstests/replsets/replset7.js b/jstests/replsets/replset7.js
index 0714a23e962..1c63fd8f35f 100644
--- a/jstests/replsets/replset7.js
+++ b/jstests/replsets/replset7.js
@@ -5,7 +5,7 @@ var rt = new ReplSetTest( { name : "replset7tests" , nodes: 1 } );
 
 var nodes = rt.startSet();
 rt.initiate();
-var master = rt.getMaster();
+var master = rt.getPrimary();
 
 var md = master.getDB( 'd' );
 var mdc = md[ 'c' ];
diff --git a/jstests/replsets/replset8.js b/jstests/replsets/replset8.js
index 51cae86670a..ead9c50f066 100644
--- a/jstests/replsets/replset8.js
+++ b/jstests/replsets/replset8.js
@@ -5,7 +5,7 @@ var rt = new ReplSetTest( { name : "replset8tests" , nodes: 1 } );
 
 var nodes = rt.startSet();
 rt.initiate();
-var master = rt.getMaster();
+var master = rt.getPrimary();
 var bigstring = "a";
 var md = master.getDB( 'd' );
 var mdc = md[ 'c' ];
diff --git a/jstests/replsets/replset9.js b/jstests/replsets/replset9.js
index 382ddd3c3e6..8ae46863087 100644
--- a/jstests/replsets/replset9.js
+++ b/jstests/replsets/replset9.js
@@ -4,7 +4,7 @@ var rt = new ReplSetTest( { name : "replset9tests" , nodes: 1, oplogSize: 300 }
 
 var nodes = rt.startSet();
 rt.initiate();
-var master = rt.getMaster();
+var master = rt.getPrimary();
 var bigstring = Array(5000).toString();
 var md = master.getDB( 'd' );
 var mdc = md[ 'c' ];
@@ -57,7 +57,7 @@ var slave = rt.add();
 print ("initiation complete!");
 var sc = slave.getDB( 'd' )[ 'c' ];
 slave.setSlaveOk();
-master = rt.getMaster();
+master = rt.getPrimary();
 
 print ("updating and deleting documents");
 bulk = master.getDB('d')['c'].initializeUnorderedBulkOp();
diff --git a/jstests/replsets/replsetadd_profile.js b/jstests/replsets/replsetadd_profile.js
index 45267f9ed4f..cc36f4c1a57 100644
--- a/jstests/replsets/replsetadd_profile.js
+++ b/jstests/replsets/replsetadd_profile.js
@@ -12,7 +12,7 @@ var replTest = new ReplSetTest({name: 'ReplSetAddProfileTestSet',
                                 nodes: [{profile: 2}]});
 replTest.startSet();
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var masterCollection = master.getDB('test').getCollection(collectionName);
 masterCollection.save({a: 1});
 
diff --git a/jstests/replsets/replsetarb2.js b/jstests/replsets/replsetarb2.js
index 75c53008c54..16388c8b92b 100644
--- a/jstests/replsets/replsetarb2.js
+++ b/jstests/replsets/replsetarb2.js
@@ -15,7 +15,7 @@
                                 ]});
 
     // Make sure we have a master
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
 
     // Make sure we have an arbiter
     assert.soon(function() {
@@ -37,7 +37,7 @@
     replTest.stop(mId);
 
     // And make sure that the slave is promoted
-    var new_master = replTest.getMaster();
+    var new_master = replTest.getPrimary();
 
     var newMasterId = replTest.getNodeId(new_master);
     assert.neq(newMasterId, mId, "Secondary wasn't promoted to new primary");
diff --git a/jstests/replsets/replsetfreeze.js b/jstests/replsets/replsetfreeze.js
index 03e9f724f8a..67c08740e98 100644
--- a/jstests/replsets/replsetfreeze.js
+++ b/jstests/replsets/replsetfreeze.js
@@ -48,7 +48,7 @@ var config = {"_id" : "unicomplex", "members" : [
     {"_id" : 1, "host" : nodes[1] },
     {"_id" : 2, "host" : nodes[2], "arbiterOnly" : true}]};
 var r = replTest.initiate(config);
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var secondary = replTest.getSecondary();
 
 replTest.awaitSecondaryNodes();
@@ -79,7 +79,7 @@ while ((new Date()).getTime() - start < (28 * 1000) ) { // we need less 30 since
 
 
 print("5: check for new master");
-master = replTest.getMaster();
+master = replTest.getPrimary();
 
 
 print("6: step down new master");
@@ -102,7 +102,7 @@ master.getDB("admin").runCommand({replSetFreeze : 0});
 
 
 print("9: check we get a new master within 30 seconds");
-master = replTest.getMaster();
+master = replTest.getPrimary();
 
 
 replTest.stopSet( 15 );
diff --git a/jstests/replsets/replsethostnametrim.js b/jstests/replsets/replsethostnametrim.js
index 44f4c7b2320..c303ecdea0d 100644
--- a/jstests/replsets/replsethostnametrim.js
+++ b/jstests/replsets/replsethostnametrim.js
@@ -4,7 +4,7 @@ var replTest = new ReplSetTest({ name: 'testSet', nodes: 1 });
 var nodes = replTest.startSet();
 replTest.initiate();
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var config = master.getDB("local").system.replset.findOne();
 config.version++;
 var origHost = config.members[0].host;
diff --git a/jstests/replsets/replsetprio1.js b/jstests/replsets/replsetprio1.js
index 04a3fb1f237..c0d6cb48a01 100644
--- a/jstests/replsets/replsetprio1.js
+++ b/jstests/replsets/replsetprio1.js
@@ -22,7 +22,7 @@
     replTest.waitForState(nodes[1], replTest.PRIMARY, 60000);
     
     // do some writes on 1
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     for (var i=0; i<1000; i++) {
         master.getDB("foo").bar.insert({i:i});
     }
@@ -36,7 +36,7 @@
     replTest.waitForState(nodes[2], replTest.PRIMARY, 60000);
 
     // make sure nothing was rolled back
-    master = replTest.getMaster();
+    master = replTest.getPrimary();
     for (i=0; i<1000; i++) {
         assert(master.getDB("foo").bar.findOne({i:i}) != null, 'checking '+i);
         assert(master.getDB("bar").baz.findOne({i:i}) != null, 'checking '+i);
diff --git a/jstests/replsets/replsetrestart1.js b/jstests/replsets/replsetrestart1.js
index 0224d0f47c7..9ff3773a24f 100644
--- a/jstests/replsets/replsetrestart1.js
+++ b/jstests/replsets/replsetrestart1.js
@@ -35,9 +35,9 @@
     // DOWN, later.
     replTest.awaitSecondaryNodes();
 
-    // Call getMaster to return a reference to the node that's been
+    // Call getPrimary to return a reference to the node that's been
     // elected master.
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var config1 = master.getDB("local").system.replset.findOne();
 
     // Now we're going to shut down all nodes
@@ -60,7 +60,7 @@
     replTest.restart( s2Id );
 
     // Make sure that a new master comes up
-    master = replTest.getMaster();
+    master = replTest.getPrimary();
     replTest.awaitSecondaryNodes();
     var config2 = master.getDB("local").system.replset.findOne();
     compare_configs(config1, config2);
diff --git a/jstests/replsets/restore_term.js b/jstests/replsets/restore_term.js
index 00fa68ed0d0..0a0af27c08f 100644
--- a/jstests/replsets/restore_term.js
+++ b/jstests/replsets/restore_term.js
@@ -30,7 +30,7 @@ conf.protocolVersion = 1;
 rst.initiate(conf);
 rst.awaitSecondaryNodes();
 
-var primary = rst.getMaster();
+var primary = rst.getPrimary();
 var primaryColl = primary.getDB("test").coll;
 
 // Current term may be greater than 1 if election race happens.
@@ -53,13 +53,13 @@ try {
 rst.awaitSecondaryNodes();
 // The secondary became the new primary now with a higher term.
 // Since there's only one secondary who may run for election, the new term is higher by 1.
-assert.eq(getCurrentTerm(rst.getMaster()), firstSuccessfulTerm + 1);
+assert.eq(getCurrentTerm(rst.getPrimary()), firstSuccessfulTerm + 1);
 
 // Restart the replset and verify the term is the same.
 rst.stopSet(null /* signal */, true /* forRestart */);
 rst.startSet({restart: true});
 rst.awaitSecondaryNodes();
-primary = rst.getMaster();
+primary = rst.getPrimary();
 
 assert.eq(primary.getDB("test").coll.find().itcount(), 1);
 // After restart, the new primary stands up with the newer term.
diff --git a/jstests/replsets/resync_with_write_load.js b/jstests/replsets/resync_with_write_load.js
index c67f1f67d59..f96c9a8e152 100644
--- a/jstests/replsets/resync_with_write_load.js
+++ b/jstests/replsets/resync_with_write_load.js
@@ -19,7 +19,7 @@ var config = { "_id": testName,
 var r = replTest.initiate(config);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 // Make sure we have a master
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var a_conn = conns[0];
 var b_conn = conns[1];
 a_conn.setSlaveOk();
diff --git a/jstests/replsets/rollback.js b/jstests/replsets/rollback.js
index 4e886b487a4..e66357b1fc5 100644
--- a/jstests/replsets/rollback.js
+++ b/jstests/replsets/rollback.js
@@ -45,7 +45,7 @@ load("jstests/replsets/rslib.js");
 
     // Make sure we have a master
     replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var a_conn = conns[0];
     var A = a_conn.getDB("admin");
     var b_conn = conns[1];
diff --git a/jstests/replsets/rollback2.js b/jstests/replsets/rollback2.js
index 1b91c8803f3..000346b17d3 100644
--- a/jstests/replsets/rollback2.js
+++ b/jstests/replsets/rollback2.js
@@ -41,7 +41,7 @@ load("jstests/replsets/rslib.js");
 
     // Make sure we have a master and that that master is node A
     replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var a_conn = conns[0];
     a_conn.setSlaveOk();
     var A = a_conn.getDB("admin");
diff --git a/jstests/replsets/rollback3.js b/jstests/replsets/rollback3.js
index 1ba4d14d255..b5bfcd655c5 100755
--- a/jstests/replsets/rollback3.js
+++ b/jstests/replsets/rollback3.js
@@ -46,7 +46,7 @@ load("jstests/replsets/rslib.js");
 
     // Make sure we have a master and that that master is node A
     replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var a_conn = conns[0];
     a_conn.setSlaveOk();
     var A = a_conn.getDB("admin");
diff --git a/jstests/replsets/rollback5.js b/jstests/replsets/rollback5.js
index 7159edead5c..c85e86bbe7c 100644
--- a/jstests/replsets/rollback5.js
+++ b/jstests/replsets/rollback5.js
@@ -22,7 +22,7 @@ var r = replTest.initiate({ "_id": "rollback5",
 
 // Make sure we have a master
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var a_conn = conns[0];
 var b_conn = conns[1];
 a_conn.setSlaveOk();
@@ -46,13 +46,13 @@ var options = { writeConcern: { w: 2, wtimeout: 60000 }, upsert: true };
 assert.writeOK(A.foo.update({ key: 'value1' }, { $set: { req: 'req' }}, options));
 replTest.stop(AID);
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host == master.host);
 options = { writeConcern: { w: 1, wtimeout: 60000 }, upsert: true };
 assert.writeOK(B.foo.update({key:'value1'}, {$set: {res: 'res'}}, options));
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host == master.host);
 options = { writeConcern: { w: 1, wtimeout: 60000 }, upsert: true };
 assert.writeOK(A.foo.update({ key: 'value2' }, { $set: { req: 'req' }}, options));
diff --git a/jstests/replsets/rollback_auth.js b/jstests/replsets/rollback_auth.js
index 589f755aaed..4e32e51b49a 100644
--- a/jstests/replsets/rollback_auth.js
+++ b/jstests/replsets/rollback_auth.js
@@ -40,7 +40,7 @@
 
     // Make sure we have a master
     replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var a_conn = conns[0];
     var b_conn = conns[1];
     a_conn.setSlaveOk();
diff --git a/jstests/replsets/rollback_cmd_unrollbackable.js b/jstests/replsets/rollback_cmd_unrollbackable.js
index 8cfe12e6523..13cac4e8459 100644
--- a/jstests/replsets/rollback_cmd_unrollbackable.js
+++ b/jstests/replsets/rollback_cmd_unrollbackable.js
@@ -25,7 +25,7 @@ var BID = replTest.getNodeId(b_conn);
 
 // get master and do an initial write
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -35,7 +35,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // insert a fake oplog entry with a non-rollbackworthy command
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 options = {writeConcern: {w: 1, wtimeout: 60000}, upsert: true};
 // another insert to set minvalid ahead
@@ -49,7 +49,7 @@ assert.writeOK(b_conn.getDB("local").oplog.rs.insert(oplog_entry));
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_collMod_PowerOf2Sizes.js b/jstests/replsets/rollback_collMod_PowerOf2Sizes.js
index 2032f9a584b..0500e5f28e3 100644
--- a/jstests/replsets/rollback_collMod_PowerOf2Sizes.js
+++ b/jstests/replsets/rollback_collMod_PowerOf2Sizes.js
@@ -25,7 +25,7 @@ replTest.initiate({"_id": name,
                        { "_id": 2, "host": nodes[2], arbiterOnly: true}]
                   });
 // Get master and do an initial write.
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var a_conn = master;
 var slaves = replTest.liveNodes.slaves;
 var b_conn = slaves[0];
@@ -63,7 +63,7 @@ assert.eq(getOptions(a_conn), {flags: 2,
 // Shut down A and fail over to B.
 replTest.stop(AID);
 replTest.restart(BID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert.eq(b_conn.host, master.host, "b_conn assumed to be master");
 b_conn = master;
 
diff --git a/jstests/replsets/rollback_collMod_fatal.js b/jstests/replsets/rollback_collMod_fatal.js
index 62cb22ac20a..03cde3e904c 100644
--- a/jstests/replsets/rollback_collMod_fatal.js
+++ b/jstests/replsets/rollback_collMod_fatal.js
@@ -26,7 +26,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -37,7 +37,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // do a collMod altering TTL which should cause FATAL when rolled back
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 assert.commandWorked(b_conn.getDB(name).runCommand({collMod: "foo",
                                                     index: {keyPattern: {x:1},
@@ -46,7 +46,7 @@ assert.commandWorked(b_conn.getDB(name).runCommand({collMod: "foo",
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_different_h.js b/jstests/replsets/rollback_different_h.js
index a6350a325da..a9ca7d1aac3 100644
--- a/jstests/replsets/rollback_different_h.js
+++ b/jstests/replsets/rollback_different_h.js
@@ -37,7 +37,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -47,7 +47,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // change the h value of the most recent entry on B
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 options = {writeConcern: {w: 1, wtimeout: 60000}, upsert: true};
 var oplog_entry = b_conn.getDB("local").oplog.rs.find().sort({$natural: -1})[0];
@@ -62,7 +62,7 @@ assert.writeOK(b_conn.getDB(name).foo.insert({x: 123}));
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_dropdb.js b/jstests/replsets/rollback_dropdb.js
index 368dbb6ee95..aba4264c561 100644
--- a/jstests/replsets/rollback_dropdb.js
+++ b/jstests/replsets/rollback_dropdb.js
@@ -26,7 +26,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -36,7 +36,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // drop database which should cause FATAL when rolled back
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 b_conn.getDB(name).dropDatabase();
 assert.eq(0, b_conn.getDB(name).foo.count(), "dropping database failed");
@@ -44,7 +44,7 @@ assert.eq(0, b_conn.getDB(name).foo.count(), "dropping database failed");
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_empty_ns.js b/jstests/replsets/rollback_empty_ns.js
index a5c6a92c1be..fea10564b43 100644
--- a/jstests/replsets/rollback_empty_ns.js
+++ b/jstests/replsets/rollback_empty_ns.js
@@ -37,7 +37,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -47,7 +47,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // insert a fake oplog entry with an empty ns
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 options = {writeConcern: {w: 1, wtimeout: 60000}, upsert: true};
 // another insert to set minvalid ahead
@@ -60,7 +60,7 @@ assert.writeOK(b_conn.getDB("local").oplog.rs.insert(oplog_entry));
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_empty_o.js b/jstests/replsets/rollback_empty_o.js
index 81a84db6eac..73a887ee2d9 100644
--- a/jstests/replsets/rollback_empty_o.js
+++ b/jstests/replsets/rollback_empty_o.js
@@ -37,7 +37,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -47,7 +47,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // insert a fake oplog entry with an empty o
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 options = {writeConcern: {w: 1, wtimeout: 60000}, upsert: true};
 // another insert to set minvalid ahead
@@ -60,7 +60,7 @@ assert.writeOK(b_conn.getDB("local").oplog.rs.insert(oplog_entry));
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_empty_o2.js b/jstests/replsets/rollback_empty_o2.js
index 7e4a22be06d..d705aa999b6 100644
--- a/jstests/replsets/rollback_empty_o2.js
+++ b/jstests/replsets/rollback_empty_o2.js
@@ -37,7 +37,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -47,7 +47,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // insert a fake oplog entry with an empty o2
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 options = {writeConcern: {w: 1, wtimeout: 60000}, upsert: true};
 // another insert to set minvalid ahead
@@ -61,7 +61,7 @@ assert.writeOK(b_conn.getDB("local").oplog.rs.insert(oplog_entry));
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_fake_cmd.js b/jstests/replsets/rollback_fake_cmd.js
index 03ae1345790..f4d54a1f146 100644
--- a/jstests/replsets/rollback_fake_cmd.js
+++ b/jstests/replsets/rollback_fake_cmd.js
@@ -37,7 +37,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -47,7 +47,7 @@ assert.writeOK(a_conn.getDB(name).foo.insert({x: 1}, options));
 replTest.stop(AID);
 
 // insert a fake oplog entry with a nonexistent command
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 options = {writeConcern: {w: 1, wtimeout: 60000}, upsert: true};
 // another insert to set minvalid ahead
@@ -61,7 +61,7 @@ assert.writeOK(b_conn.getDB("local").oplog.rs.insert(oplog_entry));
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // do a write so that B will have to roll back
diff --git a/jstests/replsets/rollback_index.js b/jstests/replsets/rollback_index.js
index 83e8df5b9a6..67360624a03 100644
--- a/jstests/replsets/rollback_index.js
+++ b/jstests/replsets/rollback_index.js
@@ -39,7 +39,7 @@ var BID = replTest.getNodeId(b_conn);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
 // get master and do an initial write
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 var options = {writeConcern: {w: 2, wtimeout: 60000}, upsert: true};
@@ -50,7 +50,7 @@ replTest.stop(AID);
 
 // Create a unique index that, if not dropped during rollback, would
 // cause errors when applying operations from the primary.
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(b_conn.host === master.host, "b_conn assumed to be master");
 options = {writeConcern: {w: 1, wtimeout: 60000}, upsert: true};
 // another insert to set minvalid ahead
@@ -61,7 +61,7 @@ assert.writeError(b_conn.getDB(name).foo.insert({x: 123}));
 // shut down B and bring back the original master
 replTest.stop(BID);
 replTest.restart(AID);
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert(a_conn.host === master.host, "a_conn assumed to be master");
 
 // Insert a document with the same value for 'x' that should be
diff --git a/jstests/replsets/rollback_too_new.js b/jstests/replsets/rollback_too_new.js
index c3ff41368ca..6365a3eceeb 100644
--- a/jstests/replsets/rollback_too_new.js
+++ b/jstests/replsets/rollback_too_new.js
@@ -27,7 +27,7 @@
     var CID = replTest.getNodeId(c_conn);
 
     // get master and do an initial write
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     var options = {writeConcern: {w: 2, wtimeout: 60000}};
     assert.writeOK(master.getDB(name).foo.insert({x: 1}, options));
 
diff --git a/jstests/replsets/rslib.js b/jstests/replsets/rslib.js
index 7111063f38e..d4cea8a51eb 100644
--- a/jstests/replsets/rslib.js
+++ b/jstests/replsets/rslib.js
@@ -102,7 +102,7 @@ waitForAllMembers = function(master, timeout) {
 
 reconfig = function(rs, config, force) {
     "use strict";
-    var admin = rs.getMaster().getDB("admin");
+    var admin = rs.getPrimary().getDB("admin");
     var e;
     var master;
     try {
@@ -114,7 +114,7 @@ reconfig = function(rs, config, force) {
         }
     }
 
-    var master = rs.getMaster().getDB("admin");
+    var master = rs.getPrimary().getDB("admin");
     waitForAllMembers(master);
 
     return master;
diff --git a/jstests/replsets/server8070.js b/jstests/replsets/server8070.js
index 8d0be219ab3..74f4d43cafa 100644
--- a/jstests/replsets/server8070.js
+++ b/jstests/replsets/server8070.js
@@ -38,7 +38,7 @@ replSet.initiate(
 );
 
 // set up common points of access
-var master = replSet.getMaster();
+var master = replSet.getPrimary();
 var primary = master.getDB("foo");
 replSet.nodes[1].setSlaveOk();
 replSet.nodes[2].setSlaveOk();
diff --git a/jstests/replsets/slavedelay1.js b/jstests/replsets/slavedelay1.js
index f8b6dd9510b..c2b26bb09a3 100644
--- a/jstests/replsets/slavedelay1.js
+++ b/jstests/replsets/slavedelay1.js
@@ -16,7 +16,7 @@ doTest = function( signal ) {
 
   replTest.initiate(config);
 
-  var master = replTest.getMaster().getDB(name);
+  var master = replTest.getPrimary().getDB(name);
   var slaveConns = replTest.liveNodes.slaves;
   var slaves = [];
   for (var i in slaveConns) {
@@ -88,7 +88,7 @@ doTest = function( signal ) {
   config.members[3].slaveDelay = 15;
 
   reconfig(replTest, config);
-  master = replTest.getMaster().getDB(name);
+  master = replTest.getPrimary().getDB(name);
   assert.soon(function() {
           return conn.getDB("local").system.replset.findOne().version == config.version;
       });
diff --git a/jstests/replsets/slavedelay3.js b/jstests/replsets/slavedelay3.js
index 920fad2a354..5a19027a4ad 100644
--- a/jstests/replsets/slavedelay3.js
+++ b/jstests/replsets/slavedelay3.js
@@ -11,7 +11,7 @@ config.members[1].slaveDelay = 5;
 config.members[2].priority = 0;
 
 replTest.initiate(config);
-var master = replTest.getMaster().getDB(name);
+var master = replTest.getPrimary().getDB(name);
 replTest.awaitReplication();
 
 var slaveConns = replTest.liveNodes.slaves;
diff --git a/jstests/replsets/stepdown.js b/jstests/replsets/stepdown.js
index 77dd76462df..502f0cf8c4c 100644
--- a/jstests/replsets/stepdown.js
+++ b/jstests/replsets/stepdown.js
@@ -36,7 +36,7 @@ var replTest = new ReplSetTest({
 var nodes = replTest.startSet();
 replTest.initiate();
 replTest.waitForState(nodes[0], replTest.PRIMARY, 60 * 1000);
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 
 // do a write
 print("\ndo a write");
@@ -80,7 +80,7 @@ replTest.liveNodes.slaves.forEach(function(slave) {
 
 print("\nreset stepped down time");
 assert.commandWorked(master.getDB("admin").runCommand({replSetFreeze:0}));
-master = replTest.getMaster();
+master = replTest.getPrimary();
 
 print("\nawait");
 replTest.awaitSecondaryNodes(90000);
@@ -97,7 +97,7 @@ assert.soon(function() {
     }
 }, "wait for n0 to be primary", 60000);
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 var firstMaster = master;
 print("\nmaster is now "+firstMaster);
 
@@ -113,10 +113,10 @@ catch (e) {
 }
 
 print("\nget a master");
-replTest.getMaster();
+replTest.getPrimary();
 
 assert.soon(function() {
-    var secondMaster = replTest.getMaster();
+    var secondMaster = replTest.getPrimary();
     return firstMaster.host !== secondMaster.host;
 }, "making sure " + firstMaster.host + " isn't still master", 60000);
 
@@ -135,7 +135,7 @@ catch (e) {
 }
 
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 assert.soon(function() {
     try {
         var result = master.getDB("admin").runCommand({replSetGetStatus:1});
@@ -149,7 +149,7 @@ assert.soon(function() {
     }
     catch (e) {
         print("error getting status from master: " + e);
-        master = replTest.getMaster();
+        master = replTest.getPrimary();
         return false;
     }
 }, 'make sure master knows that slave is down before proceeding');
@@ -166,7 +166,7 @@ assert.gte((new Date()) - now, 2750);
 
 print("\nsend shutdown command");
 
-var currentMaster = replTest.getMaster();
+var currentMaster = replTest.getPrimary();
 try {
     printjson(currentMaster.getDB("admin").runCommand({shutdown : 1, force : true}));
 }
diff --git a/jstests/replsets/stepdown3.js b/jstests/replsets/stepdown3.js
index b4464f12c22..9c3cf3d9544 100644
--- a/jstests/replsets/stepdown3.js
+++ b/jstests/replsets/stepdown3.js
@@ -6,7 +6,7 @@
 var replTest = new ReplSetTest({ name: 'testSet', nodes: 2 });
 var nodes = replTest.startSet();
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 
 // do a write to allow stepping down of the primary;
 // otherwise, the primary will refuse to step down
diff --git a/jstests/replsets/stepdown_wrt_electable.js b/jstests/replsets/stepdown_wrt_electable.js
index cb0d2446fe3..365c35f6643 100644
--- a/jstests/replsets/stepdown_wrt_electable.js
+++ b/jstests/replsets/stepdown_wrt_electable.js
@@ -8,7 +8,7 @@ var c = replTest.getReplSetConfig();
 c.members[1].priority = 0; // not electable
 replTest.initiate(c);
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var testDB = master.getDB('test');
 var firstPrimary = testDB.isMaster().primary
 
diff --git a/jstests/replsets/sync2.js b/jstests/replsets/sync2.js
index 878600c9a94..d847127cae3 100644
--- a/jstests/replsets/sync2.js
+++ b/jstests/replsets/sync2.js
@@ -10,7 +10,7 @@ replTest.initiate({"_id": "sync2",
                        {"_id": 4, host: nodes[4]}]
                  });
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 jsTestLog("Replica set test initialized");
 
 // initial sync
@@ -27,7 +27,7 @@ conns[4].disconnect(conns[1]);
 conns[4].disconnect(conns[3]);
 
 assert.soon(function() {
-    master = replTest.getMaster();
+    master = replTest.getPrimary();
     return master === conns[0];
 }, 60 * 1000, "node 0 did not become primary quickly enough");
 
diff --git a/jstests/replsets/sync_passive.js b/jstests/replsets/sync_passive.js
index f73dad062c9..fef16253896 100644
--- a/jstests/replsets/sync_passive.js
+++ b/jstests/replsets/sync_passive.js
@@ -31,7 +31,7 @@ config.members[2].priority = 0;
 replTest.initiate(config);
 replTest.waitForState(replTest.nodes[0], replTest.PRIMARY, 60 * 1000);
 
-var master = replTest.getMaster().getDB("test");
+var master = replTest.getPrimary().getDB("test");
 var server0 = master;
 var server1 = replTest.liveNodes.slaves[0];
 
@@ -67,7 +67,7 @@ replTest.awaitReplication(60 * 1000);
 
 print("add data");
 reconnect(server1);
-master = replTest.getMaster().getDB("test");
+master = replTest.getPrimary().getDB("test");
 for (var i=0;i<1000;i++) {
     master.bar.insert({x:i});
 }
diff --git a/jstests/replsets/tags2.js b/jstests/replsets/tags2.js
index 62ca15e82d8..e4d4ccd50e8 100644
--- a/jstests/replsets/tags2.js
+++ b/jstests/replsets/tags2.js
@@ -24,7 +24,7 @@ replTest.initiate( conf );
 
 replTest.awaitReplication();
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 var db = master.getDB("test");
 assert.writeOK(db.foo.insert({ x: 1 }, { writeConcern: { w: 'backedUp', wtimeout: 20000 }}));
 
@@ -33,7 +33,7 @@ conf.settings.getLastErrorModes.backedUp.backup = 3;
 master.getDB("admin").runCommand( {replSetReconfig: conf} );
 replTest.awaitReplication();
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 var db = master.getDB("test");
 assert.writeOK(db.foo.insert({ x: 2 }, { writeConcern: { w: 'backedUp', wtimeout: 20000 }}));
 
@@ -42,7 +42,7 @@ conf.members[0].priorty = 3;
 conf.members[2].priorty = 0;
 master.getDB("admin").runCommand( {replSetReconfig: conf} );
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 var db = master.getDB("test");
 assert.writeOK(db.foo.insert({ x: 3 }, { writeConcern: { w: 'backedUp', wtimeout: 20000 }}));
 
diff --git a/jstests/replsets/tags_with_reconfig.js b/jstests/replsets/tags_with_reconfig.js
index 22b2404e009..8f1e01ce176 100644
--- a/jstests/replsets/tags_with_reconfig.js
+++ b/jstests/replsets/tags_with_reconfig.js
@@ -24,7 +24,7 @@ replTest.initiate( conf );
 replTest.awaitReplication();
 
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 var db = master.getDB("test");
 
 // Insert a document with write concern : anydc
@@ -54,7 +54,7 @@ var config = master.getDB("local").system.replset.findOne();
 printjson(config);
 
 
-master = replTest.getMaster();
+master = replTest.getPrimary();
 var db = master.getDB("test");
 
 // Insert a document with write concern : anydc
diff --git a/jstests/replsets/temp_namespace.js b/jstests/replsets/temp_namespace.js
index 88a256db87f..3e75ff400e3 100644
--- a/jstests/replsets/temp_namespace.js
+++ b/jstests/replsets/temp_namespace.js
@@ -13,7 +13,7 @@ replTest.initiate({"_id" : "testSet",
                     {"_id" : 1, "host" : nodes[1]},
                     {"_id" : 2, "host" : nodes[2], "arbiterOnly" : true}]});
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var second = replTest.getSecondary();
 
 var masterId = replTest.getNodeId(master);
diff --git a/jstests/replsets/toostale.js b/jstests/replsets/toostale.js
index 9225921daf2..82e6b062d5d 100644
--- a/jstests/replsets/toostale.js
+++ b/jstests/replsets/toostale.js
@@ -58,7 +58,7 @@ replTest.initiate({_id : name, members : [
     {_id : 1, host : host+":"+replTest.ports[1], arbiterOnly : true},
     {_id : 2, host : host+":"+replTest.ports[2], priority: 0}
 ]});
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var mdb = master.getDB("foo");
 
 
diff --git a/jstests/replsets/two_initsync.js b/jstests/replsets/two_initsync.js
index 08e440406cb..603625df975 100755
--- a/jstests/replsets/two_initsync.js
+++ b/jstests/replsets/two_initsync.js
@@ -54,7 +54,7 @@ doTest = function (signal) {
         return result['ok'] == 1;
     });
 
-    var a = replTest.getMaster().getDB("two");
+    var a = replTest.getPrimary().getDB("two");
     for (var i = 0; i < 20000; i++)
         a.coll.insert({ i: i, s: "a                                                                       b" });