1 files changed, 81 insertions, 70 deletions
diff --git a/jstests/sharding/mr_shard_version.js b/jstests/sharding/mr_shard_version.js
index 481feb7f268..fc2f7f02e4b 100644
--- a/jstests/sharding/mr_shard_version.js
+++ b/jstests/sharding/mr_shard_version.js
@@ -1,89 +1,100 @@
 // Test for SERVER-4158 (version changes during mapreduce)
 (function() {
 
-var st = new ShardingTest({ shards : 2, mongos : 1 });
+    var st = new ShardingTest({shards: 2, mongos: 1});
 
-//Stop balancer, since it'll just get in the way of these
-st.stopBalancer();
+    // Stop balancer, since it'll just get in the way of these
+    st.stopBalancer();
 
-var coll = st.s.getCollection( jsTest.name() + ".coll" );
+    var coll = st.s.getCollection(jsTest.name() + ".coll");
 
-var numDocs = 50000;
-var numKeys = 1000;
-var numTests = 3;
+    var numDocs = 50000;
+    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());
+    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._connections.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._connections[i].shardName
+                },
+                check: checkMigrate
+            };
+        }
+    }
 
-assert.eq( numDocs, coll.find().itcount() );
+    var bid = benchStart({ops: ops, host: st.s.host, parallel: 1, handleErrors: false});
 
-var halfId = coll.find().itcount() / 2;
+    jsTest.log("Starting m/r...");
 
-// Shard collection in half
-st.shardColl( coll, { _id : 1 }, { _id : halfId } );
+    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;
+    };
 
-st.printShardingStatus();
+    var outputColl = st.s.getCollection(jsTest.name() + ".mrOutput");
 
-jsTest.log( "Collection now initialized with keys and values..." );
+    jsTest.log("Output coll : " + outputColl);
 
-jsTest.log( "Starting migrations..." );
+    for (var t = 0; t < numTests; t++) {
+        var results = coll.mapReduce(map, reduce, {out: {replace: outputColl.getName()}});
 
-var migrateOp = { op : "command", ns : "admin", command : { moveChunk : "" + coll } };
+        // Assert that the results are actually correct, all keys have values of (numDocs / numKeys)
+        // x key
+        var output = outputColl.find().sort({_id: 1}).toArray();
 
-var checkMigrate = function(){ print( "Result of migrate : " ); printjson( this ); };
+        // printjson( output )
 
-var ops = {};
-for( var i = 0; i < st._connections.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._connections[i].shardName },
-                                    check : checkMigrate };
+        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);
     }
-}
-
-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();
+
+    jsTest.log("Finishing parallel migrations...");
+
+    printjson(benchFinish(bid));
+
+    st.stop();
 
 })();