diff options
author | Mike Grundy <michael.grundy@10gen.com> | 2016-02-04 12:30:42 -0500 |
---|---|---|
committer | Mike Grundy <michael.grundy@10gen.com> | 2016-02-05 15:00:51 -0500 |
commit | f768da59c3c4bbee218355e2c9c7bdd1df266ff4 (patch) | |
tree | 7f15ac93b8d026cad7e3e4acbb76dca754822ebb | |
parent | bb207e87bbf6593cc73be1e4f684f3e83191ff61 (diff) | |
download | mongo-f768da59c3c4bbee218355e2c9c7bdd1df266ff4.tar.gz |
SERVER-22341 fix jslint errors in jstests/replsets with eslint --fix
47 files changed, 124 insertions, 124 deletions
diff --git a/jstests/replsets/auth1.js b/jstests/replsets/auth1.js index 4910ad3b66a..b665eec2d90 100644 --- a/jstests/replsets/auth1.js +++ b/jstests/replsets/auth1.js @@ -78,7 +78,7 @@ function doQueryOn(p) { }, [], "find did not throw, returned: " + tojson(r)).toString(); printjson(error); assert.gt(error.indexOf("not authorized"), -1, "error was non-auth"); -}; +} doQueryOn(slave); master.adminCommand({logout:1}); diff --git a/jstests/replsets/capped_id.js b/jstests/replsets/capped_id.js index 83942f6405f..8ba37ea7c14 100644 --- a/jstests/replsets/capped_id.js +++ b/jstests/replsets/capped_id.js @@ -97,7 +97,7 @@ for( testnum=0; testnum < numtests; testnum++ ){ } else if ( testnum == 3 ){ // explicitly set autoIndexId : false - masterdb.runCommand( {create : coll , capped : true , size : 1024 , autoIndexId : false } ) + masterdb.runCommand( {create : coll , capped : true , size : 1024 , autoIndexId : false } ); for(i=0; i < 500 ; i++){ masterdb.getCollection( coll ).insert( {a: 1000} ); } diff --git a/jstests/replsets/fsync_lock_read_secondaries.js b/jstests/replsets/fsync_lock_read_secondaries.js index 81f6a0be8ae..b8f8c0aa149 100644 --- a/jstests/replsets/fsync_lock_read_secondaries.js +++ b/jstests/replsets/fsync_lock_read_secondaries.js @@ -67,7 +67,7 @@ assert(slaves[0].getDB("admin").fsyncUnlock().ok); // The secondary should have equal or more documents than what it had before. assert.soon(function() { - return slaves[0].getDB("foo").bar.count() > 100 + return slaves[0].getDB("foo").bar.count() > 100; }, "count of documents stored on the secondary did not increase"); replTest.stopSet(); }()); diff --git a/jstests/replsets/groupAndMapReduce.js b/jstests/replsets/groupAndMapReduce.js index 1aff25a18eb..9fcdcbeee0e 100644 --- a/jstests/replsets/groupAndMapReduce.js +++ b/jstests/replsets/groupAndMapReduce.js @@ -23,7 +23,7 @@ doTest = function( signal ) { var master = replTest.getPrimary(); // save some records - var len = 100 + var len = 100; for (var i = 0; i < len; ++i) { master.getDB("foo").foo.save({a: i}); } @@ -100,7 +100,7 @@ doTest = function( signal ) { // Shut down the set and finish the test. replTest.stopSet( signal ); -} +}; doTest( 15 ); print("SUCCESS"); diff --git a/jstests/replsets/index_delete.js b/jstests/replsets/index_delete.js index 8747eacc412..e43e1e9a55d 100644 --- a/jstests/replsets/index_delete.js +++ b/jstests/replsets/index_delete.js @@ -26,7 +26,7 @@ var checkOp = function(checkDB) { } } return false; -} +}; // Set up replica set var replTest = new ReplSetTest({ name: 'fgIndex', nodes: 3 }); var nodes = replTest.nodeList(); @@ -66,7 +66,7 @@ jsTest.log("Index created on secondary"); masterDB.runCommand( {dropIndexes: "jstests_fgsec", index: "i_1"} ); jsTest.log("Waiting on replication"); replTest.awaitReplication(); -assert.soon( function() {return !checkOp(secondDB)}, "index not cancelled on secondary", 30000, 50); +assert.soon( function() {return !checkOp(secondDB);}, "index not cancelled on secondary", 30000, 50); masterDB.jstests_fgsec.getIndexes().forEach(printjson); secondDB.jstests_fgsec.getIndexes().forEach(printjson); assert.soon( function() { diff --git a/jstests/replsets/initial_sync4.js b/jstests/replsets/initial_sync4.js index c7c23e65497..c25bc94c4ed 100644 --- a/jstests/replsets/initial_sync4.js +++ b/jstests/replsets/initial_sync4.js @@ -55,7 +55,7 @@ for( i = N-1; i >= N-10000; --i ) { } for ( i = N; i < N*2; i++ ) { - mc.insert( { _id : i, x : i } ) + mc.insert( { _id : i, x : i } ); } assert.eq( N*2, mc.count() ); @@ -68,7 +68,7 @@ wait(function() { (status.members[1].state == 2); }); -print("8. Wait for new node to have all the data") +print("8. Wait for new node to have all the data"); wait(function() { return sc.count() == mc.count(); } ); diff --git a/jstests/replsets/ismaster1.js b/jstests/replsets/ismaster1.js index 1904145c882..8acefc875d5 100644 --- a/jstests/replsets/ismaster1.js +++ b/jstests/replsets/ismaster1.js @@ -73,7 +73,7 @@ var checkMember = function (memberInfo) { assert(badFields.length === 0 && missingFields.length === 0 && badValues.length === 0, memberInfo.name + " had the following problems." + generateErrorString(badFields, missingFields, badValues, result)); -} +}; // start of test code var name = "ismaster"; @@ -114,7 +114,7 @@ var agreeOnPrimaryAndSetVersion = function( setVersion ) { } return true; -} +}; var master = replTest.getPrimary(); assert.soon( function() { return agreeOnPrimaryAndSetVersion( 1 ); }, diff --git a/jstests/replsets/localhostAuthBypass.js b/jstests/replsets/localhostAuthBypass.js index aa50034799d..68300c7aeb2 100644 --- a/jstests/replsets/localhostAuthBypass.js +++ b/jstests/replsets/localhostAuthBypass.js @@ -177,7 +177,7 @@ var runTest = function(useHostName) { }); shutdown(rs); -} +}; var runNonlocalTest = function(ipAddr) { print("=========================="); diff --git a/jstests/replsets/maintenance.js b/jstests/replsets/maintenance.js index 40e7d878ae9..28032383e76 100644 --- a/jstests/replsets/maintenance.js +++ b/jstests/replsets/maintenance.js @@ -79,7 +79,7 @@ var ex = assert.throws( } }, [] /*no params*/, - "getmore didn't fail") + "getmore didn't fail"); assert(ex.message.match("13436"), "wrong error code -- " + ex ); diff --git a/jstests/replsets/maintenance2.js b/jstests/replsets/maintenance2.js index 401bfeb8701..f1bce2159d5 100644 --- a/jstests/replsets/maintenance2.js +++ b/jstests/replsets/maintenance2.js @@ -20,7 +20,7 @@ var master = replTest.getPrimary(); // save some records - var len = 100 + var len = 100; for (var i = 0; i < len; ++i) { master.getDB("foo").foo.save({a: i}); } diff --git a/jstests/replsets/maintenance_non-blocking.js b/jstests/replsets/maintenance_non-blocking.js index e3ccfe12504..5815893e5df 100644 --- a/jstests/replsets/maintenance_non-blocking.js +++ b/jstests/replsets/maintenance_non-blocking.js @@ -1,6 +1,6 @@ // This test ensures that the replSetMaintenance command will not block, nor block-on, a db write doTest = function() { - "use strict" + "use strict"; var replTest = new ReplSetTest( {name: 'testSet', nodes: 2} ); var nodes = replTest.startSet(); replTest.initiate(); @@ -14,34 +14,34 @@ doTest = function() { var status = assert.commandWorked(sDB.adminCommand("replSetGetStatus")); printjson(status); - print("******* fsyncLock'n secondary ************* ") + print("******* fsyncLock'n secondary ************* "); s.getDB("admin").fsyncLock(); // save some records - var len = 100 + var len = 100; for (var i = 0; i < len; ++i) { assert.writeOK(mColl.save({a: i})); } - print("******* replSetMaintenance called on secondary ************* ") - assert.commandWorked(sDB.adminCommand("replSetMaintenance")) + print("******* replSetMaintenance called on secondary ************* "); + assert.commandWorked(sDB.adminCommand("replSetMaintenance")); var ismaster = assert.commandWorked(sColl.runCommand("ismaster")); - assert.eq(false, ismaster.ismaster) - assert.eq(false, ismaster.secondary) + assert.eq(false, ismaster.ismaster); + assert.eq(false, ismaster.secondary); - print("******* writing to primary ************* ") + print("******* writing to primary ************* "); assert.writeOK(mColl.save({_id: -1})); printjson(sDB.currentOp()); assert.neq(null, mColl.findOne()); var ismaster = assert.commandWorked(sColl.runCommand("ismaster")); - assert.eq(false, ismaster.ismaster) - assert.eq(false, ismaster.secondary) + assert.eq(false, ismaster.ismaster); + assert.eq(false, ismaster.secondary); - print("******* fsyncUnlock'n secondary ************* ") + print("******* fsyncUnlock'n secondary ************* "); sDB.fsyncUnlock(); -} +}; doTest(); print("SUCCESS"); diff --git a/jstests/replsets/oplog_format.js b/jstests/replsets/oplog_format.js index c7cc18a5908..e27374eaf6e 100644 --- a/jstests/replsets/oplog_format.js +++ b/jstests/replsets/oplog_format.js @@ -21,7 +21,7 @@ var assertLastOplog = function( o, o2 , msg) { if(o2) assert.docEq(last.o2, o2, "o2 bad : " + msg); return last.ts; -} +}; // set things up. coll.save({_id:1}); @@ -31,7 +31,7 @@ assertLastOplog({_id:1}, null, "save -- setup "); * The first ones are from the old updatetests which tested the internal impl using a modSet */ -var msg = "IncRewriteExistingField: $inc $set" +var msg = "IncRewriteExistingField: $inc $set"; coll.save({_id:1, a:2}); assertLastOplog({_id:1, a:2}, {_id:1}, "save " + msg); var res = assert.writeOK(coll.update({}, { $inc: { a: 1 }, $set: { b: 2 }})); @@ -39,7 +39,7 @@ assert.eq(res.nModified, 1, "update failed for '" + msg + "': " + res.toString() assert.docEq({_id:1, a:3, b:2}, coll.findOne({}), msg); assertLastOplog({$set:{a:3, b:2}}, {_id:1}, msg); -var msg = "IncRewriteNonExistingField: $inc $set" +var msg = "IncRewriteNonExistingField: $inc $set"; coll.save({_id:1, c:0}); assertLastOplog({_id:1, c:0}, {_id:1}, "save " + msg); res = assert.writeOK(coll.update({}, { $inc: { a: 1 }, $set: { b: 2 }})); @@ -47,7 +47,7 @@ assert.eq(res.nModified, 1, "update failed for '" + msg + "': " + res.toString() assert.docEq({_id:1, c:0, a:1, b:2}, coll.findOne({}), msg); assertLastOplog({$set:{a:1, b:2}}, {_id:1}, msg); -var msg = "TwoNestedPulls: two $pull" +var msg = "TwoNestedPulls: two $pull"; coll.save({_id:1, a:{ b:[ 1, 2 ], c:[ 1, 2 ] }}); assertLastOplog({_id:1, a:{ b:[ 1, 2 ], c:[ 1, 2 ] }}, {_id:1}, "save " + msg); res = assert.writeOK(coll.update({}, { $pull: { 'a.b': 2, 'a.c': 2 }})); @@ -55,7 +55,7 @@ assert.eq(res.nModified, 1, "update failed for '" + msg + "': " + res.toString() assert.docEq({_id:1, a:{ b:[ 1 ], c:[ 1 ] }}, coll.findOne({}), msg); assertLastOplog({$set:{'a.b':[1], 'a.c':[1]}}, {_id:1}, msg); -var msg = "MultiSets: two $set" +var msg = "MultiSets: two $set"; coll.save({_id:1, a:1, b:1}); assertLastOplog({_id:1, a:1, b:1}, {_id:1}, "save " + msg); res = assert.writeOK(coll.update({}, { $set: { a: 2, b: 2 }})); @@ -65,7 +65,7 @@ assertLastOplog({$set:{a:2, b:2}}, {_id:1}, msg); // More tests to validate the oplog format and correct excution -var msg = "bad single $set" +var msg = "bad single $set"; coll.save({_id:1, a:1}); assertLastOplog({_id:1, a:1}, {_id:1}, "save " + msg); res = assert.writeOK(coll.update({}, { $set: { a: 2 }})); @@ -101,10 +101,10 @@ res = assert.writeOK(coll.update({}, { $setOnInsert: { a: -1 }})); assert.eq(res.nMatched, 1, "update failed for '" + msg + "': " + res.toString()); assert.docEq({_id:1, a:[3]}, coll.findOne({}), msg); // No-op var otherTS = assertLastOplog({$set:{"a.0": 3}}, {_id:1}, msg); // Nothing new -assert.eq(lastTS, otherTS, "new oplog was not expected -- " + msg) // No new oplog entry +assert.eq(lastTS, otherTS, "new oplog was not expected -- " + msg); // No new oplog entry -coll.remove({}) -assert.eq(coll.count(), 0, "collection not empty") +coll.remove({}); +assert.eq(coll.count(), 0, "collection not empty"); var msg = "bad $setOnInsert w/upsert"; res = assert.writeOK(coll.update({}, { $setOnInsert: { a: 200 }}, { upsert: true })); // upsert @@ -113,8 +113,8 @@ var id = res.getUpsertedId()._id; assert.docEq({_id: id, a: 200 }, coll.findOne({}), msg); // No-op assertLastOplog({ _id: id, a: 200 }, null, msg); // No new oplog entry -coll.remove({}) -assert.eq(coll.count(), 0, "collection not empty-2") +coll.remove({}); +assert.eq(coll.count(), 0, "collection not empty-2"); /* inconsistent oplog format with old code -- new is okay but less efficient * enable once we switch the default @@ -130,14 +130,14 @@ assertLastOplog({$set:{"a": [1,2,3]}}, {_id:1}, msg); // new format */ var msg = "bad array $push 2"; -coll.save({_id:1, a:"foo"}) +coll.save({_id:1, a:"foo"}); res = assert.writeOK(coll.update({}, { $push: { c: 18 }})); assert.eq(res.nModified, 1, "update failed for '" + msg + "': " + res.toString()); assert.docEq({_id:1, a:"foo", c:[18]}, coll.findOne({}), msg); assertLastOplog({$set:{"c": [18]}}, {_id:1}, msg); var msg = "bad array $push $slice"; -coll.save({_id:1, a:{b:[18]}}) +coll.save({_id:1, a:{b:[18]}}); res = assert.writeOK(coll.update({ _id: { $gt: 0 }}, { $push: { "a.b": { $each: [1, 2], $slice: -2 }}})); assert.eq(res.nModified, 1, "update failed for '" + msg + "': " + res.toString()); @@ -145,7 +145,7 @@ assert.docEq({_id:1, a: {b:[1,2]}}, coll.findOne({}), msg); assertLastOplog({$set:{"a.b": [1,2]}}, {_id:1}, msg); var msg = "bad array $push $sort ($slice -100)"; -coll.save({_id:1, a:{b:[{c:2}, {c:1}]}}) +coll.save({_id:1, a:{b:[{c:2}, {c:1}]}}); res = assert.writeOK(coll.update({}, { $push: { "a.b": { $each: [{ c: -1 }], $sort: { c: 1 }, $slice: -100 }}})); @@ -154,7 +154,7 @@ assert.docEq({_id:1, a: {b:[{c:-1}, {c:1}, {c:2}]}}, coll.findOne({}), msg); assertLastOplog({$set:{"a.b": [{c:-1},{c:1}, {c:2}]}}, {_id:1}, msg); var msg = "bad array $push $slice $sort"; -coll.save({_id:1, a:[{b:2}, {b:1}]}) +coll.save({_id:1, a:[{b:2}, {b:1}]}); res = assert.writeOK(coll.update({ _id: { $gt: 0 }}, { $push: { a: { $each: [{ b: -1 }], $slice:-2, $sort: { b: 1 }}}})); @@ -163,7 +163,7 @@ assert.docEq({_id:1, a: [{b:1}, {b:2}]}, coll.findOne({}), msg); assertLastOplog({$set:{a: [{b:1},{b:2}]}}, {_id:1}, msg); var msg = "bad array $push $slice $sort first two"; -coll.save({_id:1, a:{b:[{c:2}, {c:1}]}}) +coll.save({_id:1, a:{b:[{c:2}, {c:1}]}}); res = assert.writeOK(coll.update({ _id: { $gt: 0 }}, { $push: { "a.b": { $each: [{ c: -1 }], $slice: -2, $sort: { c: 1 }}}})); @@ -172,7 +172,7 @@ assert.docEq({_id:1, a: {b:[{c:1}, {c:2}]}}, coll.findOne({}), msg); assertLastOplog({$set:{"a.b": [{c:1},{c:2}]}}, {_id:1}, msg); var msg = "bad array $push $slice $sort reversed first two"; -coll.save({_id:1, a:{b:[{c:1}, {c:2}]}}) +coll.save({_id:1, a:{b:[{c:1}, {c:2}]}}); res = assert.writeOK(coll.update({ _id: { $gt: 0 }}, { $push: { "a.b": { $each: [{ c: -1 }], $slice: -2, $sort: { c: -1 }}}})); diff --git a/jstests/replsets/protocol_version_upgrade_downgrade.js b/jstests/replsets/protocol_version_upgrade_downgrade.js index 1cdd0ff8916..3d406baf717 100644 --- a/jstests/replsets/protocol_version_upgrade_downgrade.js +++ b/jstests/replsets/protocol_version_upgrade_downgrade.js @@ -27,9 +27,9 @@ var verbosity = { "logComponentVerbosity" : { "replication" : { "verbosity" : 3 }, } -} +}; primary.adminCommand(verbosity); -rst.getSecondaries().forEach(function (node) {node.adminCommand(verbosity)}); +rst.getSecondaries().forEach(function (node) {node.adminCommand(verbosity);}); // Do a write, this will set up sync sources on secondaries. print("do a write"); diff --git a/jstests/replsets/reconfig_without_increased_queues.js b/jstests/replsets/reconfig_without_increased_queues.js index 9f264681e1e..7b39aacce6e 100644 --- a/jstests/replsets/reconfig_without_increased_queues.js +++ b/jstests/replsets/reconfig_without_increased_queues.js @@ -54,7 +54,7 @@ } return true; }, "queues too high", 13 * 1000 /*13 secs*/); // what we are looking for has a 10s timeout. - } + }; var reconfig = function(newConfig) { newConfig.version += 1; @@ -66,7 +66,7 @@ throw e; } } - } + }; replTest.awaitSecondaryNodes(); diff --git a/jstests/replsets/reindex_secondary.js b/jstests/replsets/reindex_secondary.js index d3c0991a5d3..42c2149126c 100644 --- a/jstests/replsets/reindex_secondary.js +++ b/jstests/replsets/reindex_secondary.js @@ -5,7 +5,7 @@ var nodes = replTest.startSet(); replTest.initiate(); var master = replTest.getPrimary(); -replTest.awaitSecondaryNodes() +replTest.awaitSecondaryNodes(); var slaves = replTest.liveNodes.slaves; assert( slaves.length == 1, "Expected 1 slave but length was " + slaves.length ); diff --git a/jstests/replsets/remove1.js b/jstests/replsets/remove1.js index e15b793434b..eab87207508 100644 --- a/jstests/replsets/remove1.js +++ b/jstests/replsets/remove1.js @@ -31,7 +31,7 @@ for (var i = 0; i < config.members.length; i++) { config.members.splice(i, 1); break; } -}; +} config.version = 2; assert.eq(secondary.getDB("admin").runCommand({ping:1}).ok, diff --git a/jstests/replsets/replset2.js b/jstests/replsets/replset2.js index 656b727ba81..45e37b8551e 100644 --- a/jstests/replsets/replset2.js +++ b/jstests/replsets/replset2.js @@ -32,7 +32,7 @@ doTest = function (signal) { slaves.forEach(function (slave) { slave.setSlaveOk(); }); // Test write concern with multiple inserts. - print("\n\nreplset2.js **** Try inserting a multiple records -- first insert ****") + print("\n\nreplset2.js **** Try inserting a multiple records -- first insert ****"); printjson(master.getDB("admin").runCommand("replSetGetStatus")); @@ -41,19 +41,19 @@ doTest = function (signal) { bulk.insert({ n: 2 }); bulk.insert({ n: 3 }); - print("\nreplset2.js **** TEMP 1 ****") + print("\nreplset2.js **** TEMP 1 ****"); printjson(master.getDB("admin").runCommand("replSetGetStatus")); assert.writeOK(bulk.execute({ w: 3, wtimeout: 25000 })); - print("replset2.js **** TEMP 1a ****") + print("replset2.js **** TEMP 1a ****"); m1 = master.getDB(testDB).foo.findOne({ n: 1 }); printjson(m1); assert(m1['n'] == 1, "replset2.js Failed to save to master on multiple inserts"); - print("replset2.js **** TEMP 1b ****") + print("replset2.js **** TEMP 1b ****"); var s0 = slaves[0].getDB(testDB).foo.findOne({ n: 1 }); assert(s0['n'] == 1, "replset2.js Failed to replicate to slave 0 on multiple inserts"); @@ -62,7 +62,7 @@ doTest = function (signal) { assert(s1['n'] == 1, "replset2.js Failed to replicate to slave 1 on multiple inserts"); // Test write concern with a simple insert - print("replset2.js **** Try inserting a single record ****") + print("replset2.js **** Try inserting a single record ****"); master.getDB(testDB).dropDatabase(); var options = { writeConcern: { w: 3, wtimeout: 10000 }}; assert.writeOK(master.getDB(testDB).foo.insert({ n: 1 }, options)); @@ -77,7 +77,7 @@ doTest = function (signal) { s1 = slaves[1].getDB(testDB).foo.findOne({ n: 1 }); assert(s1['n'] == 1, "replset2.js Failed to replicate to slave 1"); - print("replset2.js **** Try inserting many records ****") + print("replset2.js **** Try inserting many records ****"); try { var bigData = new Array(2000).toString(); bulk = master.getDB(testDB).baz.initializeUnorderedBulkOp(); @@ -86,7 +86,7 @@ doTest = function (signal) { } assert.writeOK(bulk.execute({ w: 3, wtimeout: 60000 })); - print("replset2.js **** V1 ") + print("replset2.js **** V1 "); var verifyReplication = function (nodeName, collection) { data = collection.findOne({ n: 1 }); @@ -116,7 +116,7 @@ doTest = function (signal) { } replTest.stopSet(signal); -} +}; doTest( 15 ); diff --git a/jstests/replsets/replset4.js b/jstests/replsets/replset4.js index 605284e01da..8aecb715130 100644 --- a/jstests/replsets/replset4.js +++ b/jstests/replsets/replset4.js @@ -32,7 +32,7 @@ doTest = function (signal) { print("replset4.js worked, stopping"); replTest.stopSet(signal); -} +}; print("replset4.js"); doTest( 15 ); diff --git a/jstests/replsets/replset6.js b/jstests/replsets/replset6.js index 1c772cc7c28..a55c44aaea7 100644 --- a/jstests/replsets/replset6.js +++ b/jstests/replsets/replset6.js @@ -13,12 +13,12 @@ s = slaves[0]; s.setSlaveOk(); admin = m.getDB( "admin" ); -debug = function( foo ) {} // print( foo ); } +debug = function( foo ) {}; // print( foo ); } // rename within db m.getDB( baseName ).one.save( { a: 1 } ); -assert.soon( function() { v = s.getDB( baseName ).one.findOne(); return v && 1 == v.a } ); +assert.soon( function() { v = s.getDB( baseName ).one.findOne(); return v && 1 == v.a; } ); assert.commandWorked( admin.runCommand( {renameCollection:"jstests_replsets_replset6.one", to:"jstests_replsets_replset6.two"} ) ); assert.soon( function() { diff --git a/jstests/replsets/replsetfreeze.js b/jstests/replsets/replsetfreeze.js index 67c08740e98..bdbae19cc21 100644 --- a/jstests/replsets/replsetfreeze.js +++ b/jstests/replsets/replsetfreeze.js @@ -24,7 +24,7 @@ var wait = function(f) { assert(n < 200, 'tried 200 times, giving up'); sleep(1000); } -} +}; var reconnect = function(a) { wait(function() { diff --git a/jstests/replsets/resync.js b/jstests/replsets/resync.js index 550057f4541..032789649ba 100755 --- a/jstests/replsets/resync.js +++ b/jstests/replsets/resync.js @@ -32,14 +32,14 @@ // create an oplog entry with an insert assert.writeOK( A.foo.insert({ x: 1 }, { writeConcern: { w: 2, wtimeout: 60000 }})); - assert.eq(B.foo.findOne().x, 1) + assert.eq(B.foo.findOne().x, 1); // run resync and wait for it to happen assert.commandWorked(b_conn.getDB("admin").runCommand({resync:1})); replTest.awaitReplication(); replTest.awaitSecondaryNodes(); - assert.eq(B.foo.findOne().x, 1) + assert.eq(B.foo.findOne().x, 1); replTest.stop(BID); function hasCycled() { @@ -94,7 +94,7 @@ assert.commandWorked(b_conn.getDB("admin").runCommand({resync:1})); replTest.awaitReplication(); replTest.awaitSecondaryNodes(); - assert.eq(B.foo.findOne().x, 1) + assert.eq(B.foo.findOne().x, 1); replTest.stopSet(15); jsTest.log("success"); diff --git a/jstests/replsets/resync_with_write_load.js b/jstests/replsets/resync_with_write_load.js index b79ab6df616..392c7254bc5 100644 --- a/jstests/replsets/resync_with_write_load.js +++ b/jstests/replsets/resync_with_write_load.js @@ -5,7 +5,7 @@ * We cannot test each phase of the initial sync directly but by providing constant writes we can * assume that each individual phase will have data to work with, and therefore tested. */ -var testName = "resync_with_write_load" +var testName = "resync_with_write_load"; var replTest = new ReplSetTest({name: testName, nodes: 3, oplogSize: 100}); var nodes = replTest.nodeList(); @@ -46,7 +46,7 @@ var work = function() { while (true) { for (x=0; x < 100; x++) { db["a" + x].insert({a:x}); - }; + } var runTime = (new Date().getTime() - start); if (runTime > 30000) @@ -56,7 +56,7 @@ var work = function() { else sleep(1); - }; + } print("finshing loadgen"); }; //insert enough that resync node has to go through oplog replay in each step diff --git a/jstests/replsets/rollback2.js b/jstests/replsets/rollback2.js index f557802556b..6dc6d88159f 100644 --- a/jstests/replsets/rollback2.js +++ b/jstests/replsets/rollback2.js @@ -25,7 +25,7 @@ load("jstests/replsets/rslib.js"); assert.eq(33, db.bar.findOne({q: 0})["y"]); assert.eq(1, db.kap.count()); assert.eq(0, db.kap2.count()); - } + }; var name = "rollback2js"; var replTest = new ReplSetTest({ name: name, nodes: 3, useBridge: true }); diff --git a/jstests/replsets/rollback3.js b/jstests/replsets/rollback3.js index 04675164756..9abac9c3639 100755 --- a/jstests/replsets/rollback3.js +++ b/jstests/replsets/rollback3.js @@ -30,7 +30,7 @@ load("jstests/replsets/rslib.js"); assert.eq(6, db.bar.count({q: {$gt: -1}})); assert.eq(0, db.getSiblingDB("abc").foo.count()); assert.eq(0, db.getSiblingDB("abc").bar.count()); - } + }; var name = "rollback2js"; var replTest = new ReplSetTest({ name: name, nodes: 3, useBridge: true }); diff --git a/jstests/replsets/rollback5.js b/jstests/replsets/rollback5.js index 9c1a31ce100..07f02419a59 100644 --- a/jstests/replsets/rollback5.js +++ b/jstests/replsets/rollback5.js @@ -107,5 +107,5 @@ function reconnect(a) { return false; } }); -}; +} diff --git a/jstests/replsets/rollback_auth.js b/jstests/replsets/rollback_auth.js index 963ff2dcf0f..77684550d3e 100644 --- a/jstests/replsets/rollback_auth.js +++ b/jstests/replsets/rollback_auth.js @@ -19,7 +19,7 @@ assert.commandFailedWithCode(db.runCommand({collStats: 'bar'}), authzErrorCode); assert.commandWorked(db.runCommand({collStats: 'baz'})); assert.commandWorked(db.runCommand({collStats: 'foobar'})); - } + }; var authzErrorCode = 13; diff --git a/jstests/replsets/rollback_different_h.js b/jstests/replsets/rollback_different_h.js index cc2ee7a54d7..948823aa894 100644 --- a/jstests/replsets/rollback_different_h.js +++ b/jstests/replsets/rollback_different_h.js @@ -16,7 +16,7 @@ doesEntryMatch = function(array, regex) { } } return found; -} +}; // set up a set and grab things for later var name = "rollback_different_h"; diff --git a/jstests/replsets/rollback_empty_ns.js b/jstests/replsets/rollback_empty_ns.js index 66fd1deaa21..77116668971 100644 --- a/jstests/replsets/rollback_empty_ns.js +++ b/jstests/replsets/rollback_empty_ns.js @@ -16,7 +16,7 @@ doesEntryMatch = function(array, regex) { } } return found; -} +}; // set up a set and grab things for later var name = "rollback_empty_ns"; diff --git a/jstests/replsets/rollback_empty_o.js b/jstests/replsets/rollback_empty_o.js index 5f0c2b46c7e..dfc94519cb3 100644 --- a/jstests/replsets/rollback_empty_o.js +++ b/jstests/replsets/rollback_empty_o.js @@ -16,7 +16,7 @@ doesEntryMatch = function(array, regex) { } } return found; -} +}; // set up a set and grab things for later var name = "rollback_empty_o"; diff --git a/jstests/replsets/rollback_empty_o2.js b/jstests/replsets/rollback_empty_o2.js index b292bac406f..e1e5add816f 100644 --- a/jstests/replsets/rollback_empty_o2.js +++ b/jstests/replsets/rollback_empty_o2.js @@ -16,7 +16,7 @@ doesEntryMatch = function(array, regex) { } } return found; -} +}; // set up a set and grab things for later var name = "rollback_empty_o2"; diff --git a/jstests/replsets/rollback_fake_cmd.js b/jstests/replsets/rollback_fake_cmd.js index 4109f95a659..59e761b4c76 100644 --- a/jstests/replsets/rollback_fake_cmd.js +++ b/jstests/replsets/rollback_fake_cmd.js @@ -16,7 +16,7 @@ doesEntryMatch = function(array, regex) { } } return found; -} +}; // set up a set and grab things for later var name = "rollback_fake_cmd"; diff --git a/jstests/replsets/rollback_index.js b/jstests/replsets/rollback_index.js index 8514a0f26b1..1a3197f9ed0 100644 --- a/jstests/replsets/rollback_index.js +++ b/jstests/replsets/rollback_index.js @@ -18,7 +18,7 @@ doesEntryMatch = function(array, regex) { } } return found; -} +}; // set up a set and grab things for later var name = "rollback_index"; diff --git a/jstests/replsets/rslib.js b/jstests/replsets/rslib.js index dd29f53c5cc..a9c3024b51e 100644 --- a/jstests/replsets/rslib.js +++ b/jstests/replsets/rslib.js @@ -85,7 +85,7 @@ waitForAllMembers = function(master, timeout) { var failCount = 0; assert.soon( function() { - var state = null + var state = null; try { state = master.getSisterDB("admin").runCommand({replSetGetStatus:1}); failCount = 0; diff --git a/jstests/replsets/server8070.js b/jstests/replsets/server8070.js index 74f4d43cafa..2b29a7592d0 100644 --- a/jstests/replsets/server8070.js +++ b/jstests/replsets/server8070.js @@ -13,7 +13,7 @@ var waitForSameOplogPosition = function(db1, db2, errmsg) { .next(); jsTest.log("primary: " + tojson(last1) + " secondary: " + tojson(last2)); - return ((last1.ts.t === last2.ts.t) && (last1.ts.i === last2.ts.i)) + return ((last1.ts.t === last2.ts.t) && (last1.ts.i === last2.ts.i)); }, errmsg ); @@ -130,7 +130,7 @@ assert.soon( jsTest.log("member 3 collection size: " + member3.getSisterDB("foo").bar.find().itcount()); jsTest.log("curop: "); printjson(member3.getSisterDB("foo").currentOp(true)); - return ((last.ts.t === last3.ts.t) && (last.ts.i === last3.ts.i)) + return ((last.ts.t === last3.ts.t) && (last.ts.i === last3.ts.i)); }, "Replication member 3 did not apply ops 25-75" ); diff --git a/jstests/replsets/server_status_metrics.js b/jstests/replsets/server_status_metrics.js index b8ef0e210cd..46add3f0cd2 100644 --- a/jstests/replsets/server_status_metrics.js +++ b/jstests/replsets/server_status_metrics.js @@ -2,37 +2,37 @@ * Test replication metrics */ function testSecondaryMetrics(secondary, opCount, offset) { - var ss = secondary.getDB("test").serverStatus() - printjson(ss.metrics) + var ss = secondary.getDB("test").serverStatus(); + printjson(ss.metrics); - assert(ss.metrics.repl.network.readersCreated > 0, "no (oplog) readers created") - assert(ss.metrics.repl.network.getmores.num > 0, "no getmores") - assert(ss.metrics.repl.network.getmores.totalMillis > 0, "no getmores time") + assert(ss.metrics.repl.network.readersCreated > 0, "no (oplog) readers created"); + assert(ss.metrics.repl.network.getmores.num > 0, "no getmores"); + assert(ss.metrics.repl.network.getmores.totalMillis > 0, "no getmores time"); // The first oplog entry may or may not make it into network.ops now that we have two // n ops (initiate and new primary) before steady replication starts. // Sometimes, we disconnect from our sync source and since our find is a gte query, we may // double count an oplog entry, so we need some wiggle room for that. - assert.lte(ss.metrics.repl.network.ops, opCount + offset + 5, "wrong number of ops retrieved") - assert.gte(ss.metrics.repl.network.ops, opCount + offset, "wrong number of ops retrieved") - assert(ss.metrics.repl.network.bytes > 0, "zero or missing network bytes") - - assert(ss.metrics.repl.buffer.count >= 0, "buffer count missing") - assert(ss.metrics.repl.buffer.sizeBytes >= 0, "size (bytes)] missing") - assert(ss.metrics.repl.buffer.maxSizeBytes >= 0, "maxSize (bytes) missing") - - assert(ss.metrics.repl.preload.docs.num >= 0, "preload.docs num missing") - assert(ss.metrics.repl.preload.docs.totalMillis >= 0, "preload.docs time missing") - assert(ss.metrics.repl.preload.docs.num >= 0, "preload.indexes num missing") - assert(ss.metrics.repl.preload.indexes.totalMillis >= 0, "preload.indexes time missing") - - assert(ss.metrics.repl.apply.batches.num > 0, "no batches") - assert(ss.metrics.repl.apply.batches.totalMillis >= 0, "missing batch time") - assert.eq(ss.metrics.repl.apply.ops, opCount + offset, "wrong number of applied ops") + assert.lte(ss.metrics.repl.network.ops, opCount + offset + 5, "wrong number of ops retrieved"); + assert.gte(ss.metrics.repl.network.ops, opCount + offset, "wrong number of ops retrieved"); + assert(ss.metrics.repl.network.bytes > 0, "zero or missing network bytes"); + + assert(ss.metrics.repl.buffer.count >= 0, "buffer count missing"); + assert(ss.metrics.repl.buffer.sizeBytes >= 0, "size (bytes)] missing"); + assert(ss.metrics.repl.buffer.maxSizeBytes >= 0, "maxSize (bytes) missing"); + + assert(ss.metrics.repl.preload.docs.num >= 0, "preload.docs num missing"); + assert(ss.metrics.repl.preload.docs.totalMillis >= 0, "preload.docs time missing"); + assert(ss.metrics.repl.preload.docs.num >= 0, "preload.indexes num missing"); + assert(ss.metrics.repl.preload.indexes.totalMillis >= 0, "preload.indexes time missing"); + + assert(ss.metrics.repl.apply.batches.num > 0, "no batches"); + assert(ss.metrics.repl.apply.batches.totalMillis >= 0, "missing batch time"); + assert.eq(ss.metrics.repl.apply.ops, opCount + offset, "wrong number of applied ops"); } var rt = new ReplSetTest( { name : "server_status_metrics" , nodes: 2, oplogSize: 100 } ); -rt.startSet() -rt.initiate() +rt.startSet(); +rt.initiate(); rt.awaitSecondaryNodes(); @@ -61,8 +61,8 @@ assert.writeOK(testDB.a.update({}, { $set: { d: new Date() }}, options)); testSecondaryMetrics(secondary, 2000, secondaryBaseOplogInserts ); // Test getLastError.wtime and that it only records stats for w > 1, see SERVER-9005 -var startMillis = testDB.serverStatus().metrics.getLastError.wtime.totalMillis -var startNum = testDB.serverStatus().metrics.getLastError.wtime.num +var startMillis = testDB.serverStatus().metrics.getLastError.wtime.totalMillis; +var startNum = testDB.serverStatus().metrics.getLastError.wtime.num; printjson(primary.getDB("test").serverStatus().metrics); diff --git a/jstests/replsets/single_server_majority.js b/jstests/replsets/single_server_majority.js index a2c6ff62b1c..3e3a6dc7bbf 100644 --- a/jstests/replsets/single_server_majority.js +++ b/jstests/replsets/single_server_majority.js @@ -4,7 +4,7 @@ var mongod = MongoRunner.runMongod({}); // get db and collection, then perform a trivial insert -db = mongod.getDB("test") +db = mongod.getDB("test"); col = db.getCollection("single_server_majority"); col.drop(); diff --git a/jstests/replsets/slavedelay1.js b/jstests/replsets/slavedelay1.js index c2b26bb09a3..ae97d3373bc 100644 --- a/jstests/replsets/slavedelay1.js +++ b/jstests/replsets/slavedelay1.js @@ -77,7 +77,7 @@ doTest = function( signal ) { assert.soon(function() { var z = conn.getDB(name).foo.findOne({_id:123}); - return z != null && z.x == "foo" + return z != null && z.x == "foo"; }); /************* Part 3 ******************/ @@ -115,6 +115,6 @@ doTest = function( signal ) { }, 10*1000); replTest.stopSet(); -} +}; doTest(15); diff --git a/jstests/replsets/stepdown.js b/jstests/replsets/stepdown.js index 6048164ba62..cd574f725e6 100644 --- a/jstests/replsets/stepdown.js +++ b/jstests/replsets/stepdown.js @@ -66,7 +66,7 @@ printjson(assert.commandFailed(master.getDB("admin").runCommand({replSetStepDown print("\n do stepdown that should work"); assert.throws(function() { - assert.commandFailed(master.getDB("admin").runCommand({replSetStepDown:50, force:true})) + assert.commandFailed(master.getDB("admin").runCommand({replSetStepDown:50, force:true})); }); var r2 = assert.commandWorked(master.getDB("admin").runCommand({ismaster : 1})); diff --git a/jstests/replsets/stepdown3.js b/jstests/replsets/stepdown3.js index 65fa9d2df08..9bfda0ae82b 100644 --- a/jstests/replsets/stepdown3.js +++ b/jstests/replsets/stepdown3.js @@ -32,7 +32,7 @@ master.getDB("test").foo.insert({x:3}); // step down the primary asyncronously print("stepdown"); -var command = "sleep(4000); tojson(db.adminCommand( { replSetStepDown : 60, force : 1 } ));" +var command = "sleep(4000); tojson(db.adminCommand( { replSetStepDown : 60, force : 1 } ));"; var awaitShell = startParallelShell(command, master.port); print("getlasterror; should assert or return an error, depending on timing"); diff --git a/jstests/replsets/stepdown_kill_other_ops.js b/jstests/replsets/stepdown_kill_other_ops.js index c6b1c4724be..6770c9246c9 100644 --- a/jstests/replsets/stepdown_kill_other_ops.js +++ b/jstests/replsets/stepdown_kill_other_ops.js @@ -32,7 +32,7 @@ // it's killed sleep(1000); } }); - } + }; var evalRunner = startParallelShell(evalCmd, primary.port); jsTestLog("Confirming that eval() is running and has the global lock"); diff --git a/jstests/replsets/stepdown_killop.js b/jstests/replsets/stepdown_killop.js index 4b763b7d60a..a14193112d1 100644 --- a/jstests/replsets/stepdown_killop.js +++ b/jstests/replsets/stepdown_killop.js @@ -44,7 +44,7 @@ var res = db.getSiblingDB('admin').runCommand({replSetStepDown: 60, secondaryCatchUpPeriodSecs: 60}); assert.commandFailedWithCode(res, 11601 /*interrupted*/); - } + }; var stepDowner = startParallelShell(stepDownCmd, primary.port); var stepDownOpID = -1; diff --git a/jstests/replsets/stepdown_long_wait_time.js b/jstests/replsets/stepdown_long_wait_time.js index 37308885c9a..db1821cf988 100644 --- a/jstests/replsets/stepdown_long_wait_time.js +++ b/jstests/replsets/stepdown_long_wait_time.js @@ -55,7 +55,7 @@ jsTestLog("do a write and wait for it to be waiting for a lock"); var updateCmd = function() { - jsTestLog('Updating document on the primary. Blocks until the primary has stepped down.') + jsTestLog('Updating document on the primary. Blocks until the primary has stepped down.'); try { var res = db.getSiblingDB("stepDownWithLongWait").foo.update({}, {$inc: {x: 1}}); jsTestLog('Unexpected successful update operation on the primary during step down: ' + diff --git a/jstests/replsets/stepdown_wrt_electable.js b/jstests/replsets/stepdown_wrt_electable.js index 365c35f6643..e6917ec7c3b 100644 --- a/jstests/replsets/stepdown_wrt_electable.js +++ b/jstests/replsets/stepdown_wrt_electable.js @@ -10,7 +10,7 @@ replTest.initiate(c); var master = replTest.getPrimary(); var testDB = master.getDB('test'); -var firstPrimary = testDB.isMaster().primary +var firstPrimary = testDB.isMaster().primary; // do a write to allow stepping down of the primary; // otherwise, the primary will refuse to step down @@ -19,7 +19,7 @@ replTest.awaitReplication(); // stepdown should fail since there is no-one to elect within 10 secs testDB.adminCommand({replSetStepDown:5}); -assert(master.getDB("a").isMaster().ismaster, "not master") +assert(master.getDB("a").isMaster().ismaster, "not master"); // step down the primary asyncronously so it doesn't kill this test var wait = startParallelShell("db.adminCommand({replSetStepDown:1000, force:true})", master.port); @@ -35,7 +35,7 @@ assert.soon( function() { } catch (e) { return false; } - }, "they shouldn't be master, but are") + }, "they shouldn't be master, but are"); // stop replTest.stopSet(); diff --git a/jstests/replsets/temp_namespace.js b/jstests/replsets/temp_namespace.js index 3e75ff400e3..07e5291da0e 100644 --- a/jstests/replsets/temp_namespace.js +++ b/jstests/replsets/temp_namespace.js @@ -96,7 +96,7 @@ assert.eq(countIndexesFor(secondDB,/temp\d$/), 0); // indexes (2 _id + 2 x) assert.eq(countCollection(secondDB,/keep\d$/), 4); // check that former primary dropped collections -replTest.awaitReplication() +replTest.awaitReplication(); assert.eq(countCollection(masterDB,/temp\d$/), 0); // collections assert.eq(countIndexesFor(masterDB,/temp\d$/), 0); // indexes (2 _id + 2 x) assert.eq(countCollection(masterDB,/keep\d$/), 4); diff --git a/jstests/replsets/toostale.js b/jstests/replsets/toostale.js index 82e6b062d5d..32c75e953b8 100644 --- a/jstests/replsets/toostale.js +++ b/jstests/replsets/toostale.js @@ -33,7 +33,7 @@ var wait = function(f) { assert(n < 200, 'tried 200 times, giving up'); sleep(1000); } -} +}; var reconnect = function(a) { wait(function() { @@ -48,7 +48,7 @@ var reconnect = function(a) { }; -var name = "toostale" +var name = "toostale"; var replTest = new ReplSetTest({ name: name, nodes: 3, oplogSize: 5 }); var host = getHostName(); @@ -72,7 +72,7 @@ replTest.awaitReplication(); print("3: stop s2"); replTest.stop(2); print("waiting until the master knows the slave is blind"); -assert.soon(function() { return master.getDB("admin").runCommand({replSetGetStatus:1}).members[2].health == 0 }); +assert.soon(function() { return master.getDB("admin").runCommand({replSetGetStatus:1}).members[2].health == 0; }); print("okay"); print("4: overflow oplog"); @@ -97,7 +97,7 @@ while (count > prevCount) { print("5: restart s2"); replTest.restart(2); print("waiting until the master knows the slave is not blind"); -assert.soon(function() { return master.getDB("admin").runCommand({replSetGetStatus:1}).members[2].health != 0 }); +assert.soon(function() { return master.getDB("admin").runCommand({replSetGetStatus:1}).members[2].health != 0; }); print("okay"); diff --git a/jstests/replsets/two_initsync.js b/jstests/replsets/two_initsync.js index 603625df975..bdb0c96bc5a 100755 --- a/jstests/replsets/two_initsync.js +++ b/jstests/replsets/two_initsync.js @@ -87,7 +87,7 @@ doTest = function (signal) { print("two_initsync.js SUCCESS"); replTest.stopSet(signal); -} +}; print("two_initsync.js"); diff --git a/jstests/replsets/two_nodes_priority_take_over.js b/jstests/replsets/two_nodes_priority_take_over.js index 7e9714c8621..fde16703627 100644 --- a/jstests/replsets/two_nodes_priority_take_over.js +++ b/jstests/replsets/two_nodes_priority_take_over.js @@ -27,8 +27,8 @@ var verbosity = { "verbosity": 4, "storage" : { "verbosity" : 1 } } -} -rst.nodes.forEach(function (node) {node.adminCommand(verbosity)}); +}; +rst.nodes.forEach(function (node) {node.adminCommand(verbosity);}); // The first node will be the primary at the beginning. rst.waitForState(rst.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000); |