SERVER-21186 Make all sharding tests use default verbosity of 1

The default ShardingTest verbosity is currently zero, but we have many
tests, which bump it to 1 and even higher.

Since verbosity level of 0 is sometimes insufficient for investigating
transient failures, this change makes the default to be 1 and removes all
places, which explicitly make it 1 or higher.

29 files changed, 109 insertions, 42 deletions

diff --git a/jstests/sharding/auth.js b/jstests/sharding/auth.js
index 80425fed0bf..e16cd8cf5aa 100644
--- a/jstests/sharding/auth.js
+++ b/jstests/sharding/auth.js
@@ -47,7 +47,6 @@ function getShardName(rsTest) {
 var s = new ShardingTest({ name: "auth",
                            mongos: 1,
                            shards: 0,
-                           verbose: 0,
                            other: {
                                 extraOptions: { "keyFile": "jstests/libs/key1" },
                                 noChunkSize: true, }
@@ -84,7 +83,7 @@ s.restartMongos(0, { v: 2,
 login(adminUser);
 
 var d1 = new ReplSetTest({ name : "d1", nodes : 3, useHostName : true });
-d1.startSet({keyFile : "jstests/libs/key2", verbose : 0});
+d1.startSet({keyFile : "jstests/libs/key2" });
 d1.initiate();
 
 print("d1 initiated");
@@ -116,7 +115,7 @@ assert(thrown);
 print("start rs w/correct key");
 
 d1.stopSet();
-d1.startSet({keyFile : "jstests/libs/key1", verbose : 0});
+d1.startSet({keyFile : "jstests/libs/key1" });
 d1.initiate();
 
 var master = d1.getMaster();
@@ -162,7 +161,7 @@ assert.eq( 1 , s.getDB( "test" ).foo.find().itcount() , tojson(result) );
 logout(testUser);
 
 var d2 = new ReplSetTest({name : "d2", nodes : 3, useHostName : true });
-d2.startSet({keyFile : "jstests/libs/key1", verbose : 0});
+d2.startSet({keyFile : "jstests/libs/key1" });
 d2.initiate();
 d2.awaitSecondaryNodes();
 
diff --git a/jstests/sharding/auth_add_shard.js b/jstests/sharding/auth_add_shard.js
index 48661a22fe0..a20f34034cd 100644
--- a/jstests/sharding/auth_add_shard.js
+++ b/jstests/sharding/auth_add_shard.js
@@ -15,7 +15,7 @@ adminUser = { db : "admin", username : "foo", password : "bar" };
 
 //set up a 2 shard cluster with keyfile
 var st = new ShardingTest( { name : "auth_add_shard1", shards : 1,
-                            mongos : 1, verbose : 1, keyFile : "jstests/libs/key1" } )
+                            mongos : 1, keyFile : "jstests/libs/key1" } )
 
 var mongos = st.s0
 var admin = mongos.getDB("admin")
diff --git a/jstests/sharding/auto1.js b/jstests/sharding/auto1.js
index 433352a288b..644453c176f 100644
--- a/jstests/sharding/auto1.js
+++ b/jstests/sharding/auto1.js
@@ -3,7 +3,6 @@
 var s = new ShardingTest({ name: "auto1",
                            shards: 2,
                            mongos: 1,
-                           verbose: 1,
                            other: { enableBalancer : 1 } });
 
 s.adminCommand( { enablesharding : "test" } );
diff --git a/jstests/sharding/auto2.js b/jstests/sharding/auto2.js
index 0fc17a55124..0c0a6730250 100644
--- a/jstests/sharding/auto2.js
+++ b/jstests/sharding/auto2.js
@@ -2,8 +2,7 @@
 
 var s = new ShardingTest({ name: "auto2",
                            shards: 2,
-                           mongos: 2,
-                           verbose: 1 });
+                           mongos: 2 });
 
 s.adminCommand( { enablesharding : "test" } );
 s.ensurePrimaryShard('test', 'shard0001');
diff --git a/jstests/sharding/balance_tags1.js b/jstests/sharding/balance_tags1.js
index 052260b47e9..19d55bb0270 100644
--- a/jstests/sharding/balance_tags1.js
+++ b/jstests/sharding/balance_tags1.js
@@ -2,7 +2,6 @@
 var st = new ShardingTest({ name: "balance_tags1",
                             shards: 3,
                             mongos: 1,
-                            verbose: 1,
                             other: { chunkSize: 1,
                                      enableBalancer : true } });
 
diff --git a/jstests/sharding/balance_tags2.js b/jstests/sharding/balance_tags2.js
index 6b584a907d7..5f5697cadf9 100644
--- a/jstests/sharding/balance_tags2.js
+++ b/jstests/sharding/balance_tags2.js
@@ -2,7 +2,6 @@
 var s = new ShardingTest({ name: "balance_tags2",
                            shards: 3,
                            mongos: 1,
-                           verbose: 1,
                            other: { chunkSize: 1,
                                     enableBalancer : true } });
 
diff --git a/jstests/sharding/features3.js b/jstests/sharding/features3.js
index 04f54655afd..8bf3937732d 100644
--- a/jstests/sharding/features3.js
+++ b/jstests/sharding/features3.js
@@ -6,9 +6,7 @@
 //   - Verifies a $where query can be killed on multiple DBs
 //   - Tests fsync and fsync+lock permissions on sharded db
 
-var s = new ShardingTest({shards: 2,
-                          mongos: 1,
-                          verbose:1});
+var s = new ShardingTest({shards: 2, mongos: 1 });
 
 var db = s.getDB("test");   // db variable name is required due to startParallelShell()
 var numDocs = 10000;
diff --git a/jstests/sharding/findandmodify2.js b/jstests/sharding/findandmodify2.js
index 2ce2988c470..81fa6de93fd 100644
--- a/jstests/sharding/findandmodify2.js
+++ b/jstests/sharding/findandmodify2.js
@@ -1,4 +1,4 @@
-var s = new ShardingTest({ name: "find_and_modify_sharded_2", shards: 2, verbose: 2, mongos: 1, other: { chunkSize: 1 }});
+var s = new ShardingTest({ name: "find_and_modify_sharded_2", shards: 2, mongos: 1, other: { chunkSize: 1 }});
 s.adminCommand( { enablesharding : "test" } );
 
 var db = s.getDB( "test" );
diff --git a/jstests/sharding/geo_shardedgeonear.js b/jstests/sharding/geo_shardedgeonear.js
index caa1287be92..6ed2971e0d6 100644
--- a/jstests/sharding/geo_shardedgeonear.js
+++ b/jstests/sharding/geo_shardedgeonear.js
@@ -37,7 +37,7 @@ function test(db, sharded, indexType) {
     assert.commandWorked(db.runCommand(geoCmd), tojson({sharded: sharded, indexType: indexType}));
 }
 
-var sharded = new ShardingTest({shards: 3, verbose: 0, mongos: 1});
+var sharded = new ShardingTest({ shards: 3, mongos: 1 });
 sharded.stopBalancer();
 sharded.adminCommand( { enablesharding : "test" } );
 var shardedDB = sharded.getDB('test');
diff --git a/jstests/sharding/hash_basic.js b/jstests/sharding/hash_basic.js
index 6ddefdbb552..62658f6ff9a 100644
--- a/jstests/sharding/hash_basic.js
+++ b/jstests/sharding/hash_basic.js
@@ -1,8 +1,7 @@
 /**
  * @tags : [ hashed ] 
  */
-var st = new ShardingTest({ shards: 2, chunkSize: 1, other: { shardOptions: { verbose: 1 }} });
-st.stopBalancer();
+var st = new ShardingTest({ shards: 2, chunkSize: 1 });
 
 var testDB = st.s.getDB('test');
 testDB.adminCommand({ enableSharding: 'test' });
diff --git a/jstests/sharding/hash_shard_num_chunks.js b/jstests/sharding/hash_shard_num_chunks.js
index 01b140f1583..bfb84494846 100644
--- a/jstests/sharding/hash_shard_num_chunks.js
+++ b/jstests/sharding/hash_shard_num_chunks.js
@@ -3,7 +3,7 @@
 
 (function() {
 
-var s = new ShardingTest({ shards: 3, mongos: 1, verbose: 1 });
+var s = new ShardingTest({ shards: 3, mongos: 1 });
 s.stopBalancer();
 
 var dbname = "test";
diff --git a/jstests/sharding/hash_skey_split.js b/jstests/sharding/hash_skey_split.js
index e8f77a743c3..a1f0060feae 100644
--- a/jstests/sharding/hash_skey_split.js
+++ b/jstests/sharding/hash_skey_split.js
@@ -1,7 +1,6 @@
 (function() {
 
-var st = new ShardingTest({ shards: 2, other: { shardOptions: { verbose: 1 }} });
-st.stopBalancer();
+var st = new ShardingTest({ shards: 2 });
 
 var configDB = st.s.getDB('config');
 assert.commandWorked(configDB.adminCommand({ enableSharding: 'test' }));
diff --git a/jstests/sharding/large_chunk.js b/jstests/sharding/large_chunk.js
index 7506f03e14a..613c30a1c1f 100644
--- a/jstests/sharding/large_chunk.js
+++ b/jstests/sharding/large_chunk.js
@@ -5,7 +5,6 @@
 // Note that early splitting will start with a 1/4 of max size currently.  
 var s = new ShardingTest({ name: 'large_chunk',
                            shards: 2,
-                           verbose: 2,
                            other: { chunkSize: 1024 } });
 
 // take the balancer out of the equation
diff --git a/jstests/sharding/mrShardedOutput.js b/jstests/sharding/mrShardedOutput.js
index b30c45b8aa2..55b95386a7b 100644
--- a/jstests/sharding/mrShardedOutput.js
+++ b/jstests/sharding/mrShardedOutput.js
@@ -4,9 +4,7 @@
 // collection input twice the size of the first and outputs it to the new sharded
 // collection created in the first pass.
 
-var st = new ShardingTest({ shards: 2, verbose: 1, other: { chunkSize: 1 }});
-
-st.stopBalancer();
+var st = new ShardingTest({ shards: 2, other: { chunkSize: 1 }});
 
 var config = st.getDB("config");
 st.adminCommand( { enablesharding: "test" } );
diff --git a/jstests/sharding/mr_shard_version.js b/jstests/sharding/mr_shard_version.js
new file mode 100644
index 00000000000..2cf519d5c7f
--- /dev/null
+++ b/jstests/sharding/mr_shard_version.js
@@ -0,0 +1,89 @@
+// Test for SERVER-4158 (version changes during mapreduce)
+(function() {
+
+var st = new ShardingTest({ shards : 2, mongos : 1 });
+
+//Stop balancer, since it'll just get in the way of these
+st.stopBalancer()
+
+var coll = st.s.getCollection( jsTest.name() + ".coll" )
+
+var numDocs = 500000
+var numKeys = 1000
+var numTests = 3
+
+var bulk = coll.initializeUnorderedBulkOp();
+for( var i = 0; i < numDocs; i++ ){
+    bulk.insert({ _id: i, key: "" + ( i % numKeys ), value: i % numKeys });
+}
+assert.writeOK(bulk.execute());
+
+assert.eq( numDocs, coll.find().itcount() )
+
+var halfId = coll.find().itcount() / 2
+
+// Shard collection in half
+st.shardColl( coll, { _id : 1 }, { _id : halfId } )
+
+st.printShardingStatus()
+
+jsTest.log( "Collection now initialized with keys and values..." )
+
+jsTest.log( "Starting migrations..." )
+
+var migrateOp = { op : "command", ns : "admin", command : { moveChunk : "" + coll } }
+
+var checkMigrate = function(){ print( "Result of migrate : " ); printjson( this ) }
+
+var ops = {}
+for( var i = 0; i < st._shardServers.length; i++ ){
+    for( var j = 0; j < 2; j++ ){
+        ops[ "" + (i * 2 + j) ] = { op : "command", ns : "admin", 
+                                    command : { moveChunk : "" + coll, 
+                                                     find : { _id : ( j == 0 ? 0 : halfId ) },
+                                                       to : st._shardServers[i].shardName } } // , check : checkMigrate }
+        // TODO:  Deadlock due to global V8Lock between scopes if we stop with a js check
+    }
+}
+
+var bid = benchStart({ ops : ops,
+                       host : st.s.host,
+                       parallel : 1,
+                       handleErrors : false })
+
+jsTest.log( "Starting m/r..." )
+                       
+var map = function(){ emit( this.key, this.value ) }
+var reduce = function(k, values){ 
+    var total = 0
+    for( var i = 0; i < values.length; i++ ) total += values[i]
+    return total
+}
+
+var outputColl = st.s.getCollection( jsTest.name() + ".mrOutput" )
+
+jsTest.log( "Output coll : " + outputColl )
+
+for( var t = 0; t < numTests; t++ ){
+
+    var results = coll.mapReduce( map, reduce, { out : { replace : outputColl.getName() } })
+    
+    // Assert that the results are actually correct, all keys have values of (numDocs / numKeys) x key
+    var output = outputColl.find().sort({ _id : 1 }).toArray()
+    
+    // printjson( output )
+    
+    assert.eq( output.length, numKeys )
+    printjson( output )
+    for( var i = 0; i < output.length; i++ )
+        assert.eq( parseInt( output[i]._id ) * ( numDocs / numKeys ), output[i].value )
+    
+}
+
+jsTest.log( "Finishing parallel migrations..." )
+
+printjson( benchFinish( bid ) )
+
+st.stop();
+
+})();
diff --git a/jstests/sharding/noUpdateButN1inAnotherCollection.js b/jstests/sharding/noUpdateButN1inAnotherCollection.js
index 73b6dd8a9ec..27c40e9056b 100644
--- a/jstests/sharding/noUpdateButN1inAnotherCollection.js
+++ b/jstests/sharding/noUpdateButN1inAnotherCollection.js
@@ -6,7 +6,7 @@ function debug( str ) {
 var name = "badNonUpdate";
 debug("Starting sharded cluster test stuff");
 
-var s = new ShardingTest({name: name, shards : 2, mongos : 2, verbose: 5 });
+var s = new ShardingTest({ name: name, shards: 2, mongos : 2 });
 
 var mongosA=s.s0;
 var mongosB=s.s1;
@@ -55,4 +55,3 @@ var res = mongosB.getDB("test").coll2.update({ _id: 0 }, { $set: { c: "333" }});
 assert.eq( 0, res.nModified );
 
 s.stop();
-
diff --git a/jstests/sharding/read_pref.js b/jstests/sharding/read_pref.js
index c372f204e47..ea98a8273ee 100755
--- a/jstests/sharding/read_pref.js
+++ b/jstests/sharding/read_pref.js
@@ -13,8 +13,9 @@ var SEC_TAGS = [
 var NODES = SEC_TAGS.length + 1;
 
 var doTest = function(useDollarQuerySyntax) {
-    var st = new ShardingTest({ shards: { rs0: { nodes: NODES, oplogSize: 10, verbose: 2,
-                    useHostName: true }}});
+    var st = new ShardingTest({ shards: {
+                                    rs0: { nodes: NODES, oplogSize: 10, useHostName: true }
+                                }});
     var replTest = st.rs0;
     var primaryNode = replTest.getMaster();
 
diff --git a/jstests/sharding/remove2.js b/jstests/sharding/remove2.js
index 74f760050db..55c2b0bd17e 100644
--- a/jstests/sharding/remove2.js
+++ b/jstests/sharding/remove2.js
@@ -72,7 +72,6 @@ var st = new ShardingTest({ shards: {
                                 rs0: { nodes: 2 },
                                 rs1: { nodes: 2 }
                             },
-                            verbose: 0,
                             other: {
                                 chunkSize: 1,
                                 enableBalancer: true
diff --git a/jstests/sharding/rename.js b/jstests/sharding/rename.js
index 85bb3bffd37..116af4592ae 100644
--- a/jstests/sharding/rename.js
+++ b/jstests/sharding/rename.js
@@ -4,7 +4,6 @@
 
 var s = new ShardingTest({ name: "rename",
                            shards: 2,
-                           verbose: 1,
                            mongos: 1,
                            rs: { oplogSize: 10 } });
 
diff --git a/jstests/sharding/shard_existing.js b/jstests/sharding/shard_existing.js
index 6283a0868bf..35f8d4bd1b0 100644
--- a/jstests/sharding/shard_existing.js
+++ b/jstests/sharding/shard_existing.js
@@ -3,7 +3,6 @@
 var s = new ShardingTest({ name: "shard_existing",
                            shards: 2,
                            mongos: 1,
-                           verbose: 1,
                            other: { chunkSize: 1 } });
 
 db = s.getDB( "test" )
diff --git a/jstests/sharding/sharding_balance1.js b/jstests/sharding/sharding_balance1.js
index e577511e571..6142964a35c 100644
--- a/jstests/sharding/sharding_balance1.js
+++ b/jstests/sharding/sharding_balance1.js
@@ -3,7 +3,6 @@
 var s = new ShardingTest({ name: "slow_sharding_balance1",
                            shards: 2,
                            mongos: 1,
-                           verbose: 1,
                            other: { chunkSize: 1, enableBalancer : true } });
 
 s.adminCommand( { enablesharding : "test" } );
diff --git a/jstests/sharding/sharding_balance3.js b/jstests/sharding/sharding_balance3.js
index f42dec42a57..e2acdc2b356 100644
--- a/jstests/sharding/sharding_balance3.js
+++ b/jstests/sharding/sharding_balance3.js
@@ -5,7 +5,6 @@
 var s = new ShardingTest({ name: "slow_sharding_balance3",
                            shards: 2,
                            mongos: 1,
-                           verbose: 2,
                            other: { chunkSize: 1, enableBalancer : true } });
 
 s.adminCommand( { enablesharding : "test" } );
diff --git a/jstests/sharding/sharding_balance4.js b/jstests/sharding/sharding_balance4.js
index 3560dac9a6b..f530c31856f 100644
--- a/jstests/sharding/sharding_balance4.js
+++ b/jstests/sharding/sharding_balance4.js
@@ -4,7 +4,6 @@
 var s = new ShardingTest({ name: "slow_sharding_balance4",
                            shards: 2,
                            mongos: 1,
-                           verbose: 1,
                            other: { chunkSize: 1 } });
 
 s.adminCommand( { enablesharding : "test" } );
diff --git a/jstests/sharding/sharding_migrate_cursor1.js b/jstests/sharding/sharding_migrate_cursor1.js
index fa8668ae2bb..81b91eb420a 100644
--- a/jstests/sharding/sharding_migrate_cursor1.js
+++ b/jstests/sharding/sharding_migrate_cursor1.js
@@ -6,7 +6,6 @@ var chunkSize = 25
 var s = new ShardingTest({ name: "migrate_cursor1",
                            shards: 2,
                            mongos: 1,
-                           verbose: 1,
                            other: { chunkSize : chunkSize } });
 
 s.adminCommand( { enablesharding : "test" } );
diff --git a/jstests/sharding/sharding_multiple_ns_rs.js b/jstests/sharding/sharding_multiple_ns_rs.js
index 1bb121c544f..e47c8b60ba3 100644
--- a/jstests/sharding/sharding_multiple_ns_rs.js
+++ b/jstests/sharding/sharding_multiple_ns_rs.js
@@ -3,7 +3,6 @@
 var s = new ShardingTest({ name: "Sharding multiple ns",
                            shards: 1,
                            mongos: 1,
-                           verbose: 1,
                            other: { rs : true , chunkSize: 1 } });
 
 s.adminCommand( { enablesharding : "test" } );
diff --git a/jstests/sharding/sharding_rs2.js b/jstests/sharding/sharding_rs2.js
index c439eeb6b17..cc0cd299673 100644
--- a/jstests/sharding/sharding_rs2.js
+++ b/jstests/sharding/sharding_rs2.js
@@ -2,11 +2,10 @@
 (function() {
 
 var s = new ShardingTest({ shards: { rs0: { nodes: 2 }, rs1: { nodes: 2 } },
-                           verbose: 1,
                            chunkSize: 1 });
 
-db = s.getDB( "test" )
-t = db.foo
+var db = s.getDB("test");
+var t = db.foo;
 
 s.adminCommand( { enablesharding : "test" } );
 s.ensurePrimaryShard('test', 'test-rs0');
diff --git a/jstests/sharding/stats.js b/jstests/sharding/stats.js
index de08c73d83d..397c4f22fef 100644
--- a/jstests/sharding/stats.js
+++ b/jstests/sharding/stats.js
@@ -3,7 +3,6 @@
 var s = new ShardingTest({ name: "stats",
                            shards: 2,
                            mongos: 1,
-                           verbose: 1,
                            other: { enableBalancer: true } });
 
 s.adminCommand( { enablesharding : "test" } );
diff --git a/jstests/sharding/version1.js b/jstests/sharding/version1.js
index d3d317122b2..d6f786e8ff3 100644
--- a/jstests/sharding/version1.js
+++ b/jstests/sharding/version1.js
@@ -1,6 +1,6 @@
 (function() {
 
-var s = new ShardingTest({ name: "version1", shards: 1, verbose: 2 });
+var s = new ShardingTest({ name: "version1", shards: 1 });
 
 s.adminCommand( { enablesharding : "alleyinsider" } );
 s.adminCommand( { shardcollection : "alleyinsider.foo" , key : { num : 1 } } );
diff --git a/jstests/sharding/version2.js b/jstests/sharding/version2.js
index ae6109ca141..06a0a27c9b4 100644
--- a/jstests/sharding/version2.js
+++ b/jstests/sharding/version2.js
@@ -1,6 +1,6 @@
 (function() {
 
-var s = new ShardingTest({ name: "version2", shards: 1, verbose: 2 });
+var s = new ShardingTest({ name: "version2", shards: 1 });
 
 s.adminCommand( { enablesharding : "alleyinsider" } );
 s.adminCommand( { shardcollection : "alleyinsider.foo" , key : { num : 1 } } );