SERVER-21976 fixing mongos' routing of dataSize command to mongods: it was using the wrong database

1 files changed, 27 insertions, 21 deletions

diff --git a/jstests/core/datasize2.js b/jstests/core/datasize2.js
index b189b361e44..4de0b88717a 100644
--- a/jstests/core/datasize2.js
+++ b/jstests/core/datasize2.js
@@ -1,27 +1,33 @@
+//
+// Test dataSize command, when called on the same or different database
+// than the collection being queried.
+//
 
-t = db.datasize2;
-t.drop();
+(function() {
+"use strict"
 
-N = 1000;
-for ( i=0; i<N; i++ ){
-    t.insert( { _id : i , s : "asdasdasdasdasdasdasd" } );
-}
-
-c = { dataSize : "test.datasize2" ,  
-      "keyPattern" : {
-          "_id" : 1
-      },
-      "min" : {
-          "_id" : 0
-      },
-      "max" : {
-          "_id" : N
-      }
-    };
+var coll = db.foo;
+var adminDB = db.getSiblingDB('admin');
+coll.drop();
 
+var N = 1000;
+for (var i = 0; i < N; i++) {
+    coll.insert({_id: i, s: "asdasdasdasdasdasdasd"});
+}
 
-assert.eq( N , db.runCommand( c ).numObjects , "A" );
+var dataSizeCommand = { "dataSize": "test.foo",
+                    "keyPattern": { "_id" : 1 },
+                    "min": { "_id" : 0 },
+                    "max": { "_id" : N } };
 
-c.maxObjects = 100;
-assert.eq( 101 , db.runCommand( c ).numObjects , "B" );
+assert.eq(N, db.runCommand(dataSizeCommand).numObjects,
+          "dataSize command on 'test.foo' failed when called on the 'test' DB.");
+assert.eq(N, adminDB.runCommand(dataSizeCommand).numObjects,
+          "dataSize command on 'test.foo' failed when called on the 'admin' DB.");
 
+dataSizeCommand.maxObjects = 100;
+assert.eq(101, db.runCommand(dataSizeCommand).numObjects,
+          "dataSize command with max number of objects set failed on 'test' DB");
+assert.eq(101, db.runCommand(dataSizeCommand).numObjects,
+          "dataSize command with max number of objects set failed on 'admin' DB");
+})();