SERVER-20194 use the new mongos query path by default for legacy OP_QUERY/OP_GET_MORE reads

Explicitly configures yet-to-be-debugged tests to use the old mongos query path
by setting useClusterClientCursor=false.

13 files changed, 49 insertions, 0 deletions

diff --git a/jstests/noPassthroughWithMongod/sharding_balance4.js b/jstests/noPassthroughWithMongod/sharding_balance4.js
index 9ce404d9f95..542c0931b78 100644
--- a/jstests/noPassthroughWithMongod/sharding_balance4.js
+++ b/jstests/noPassthroughWithMongod/sharding_balance4.js
@@ -5,6 +5,9 @@
 s = new ShardingTest( "slow_sharding_balance4" , 2 , 1 , 1 , { chunksize : 1 } )
 s.stopBalancer();
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(s.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 s.adminCommand( { enablesharding : "test" } );
 s.ensurePrimaryShard('test', 'shard0001');
 s.adminCommand( { shardcollection : "test.foo" , key : { _id : 1 } } );
diff --git a/jstests/noPassthroughWithMongod/stale_clustered.js b/jstests/noPassthroughWithMongod/stale_clustered.js
index 04f7f4c45af..ea605404b45 100644
--- a/jstests/noPassthroughWithMongod/stale_clustered.js
+++ b/jstests/noPassthroughWithMongod/stale_clustered.js
@@ -16,6 +16,10 @@ var shardTest = new ShardingTest( name = "clusteredstale" ,
 
 shardTest.setBalancer( false )
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(shardTest.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+assert.commandWorked(shardTest.s1.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 var mongos = shardTest.s0
 var mongosSOK = shardTest.s1
 mongosSOK.setSlaveOk()
diff --git a/jstests/sharding/authConnectionHook.js b/jstests/sharding/authConnectionHook.js
index e13c04dc73c..9255bbe9ecd 100644
--- a/jstests/sharding/authConnectionHook.js
+++ b/jstests/sharding/authConnectionHook.js
@@ -16,6 +16,9 @@ st.ensurePrimaryShard('test', 'shard0001');
 adminDB.runCommand({shardCollection : "test.foo", key : {x : 1}});
 st.stopBalancer();
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(adminDB.runCommand({setParameter: 1, useClusterClientCursor: false}));
+
 for (var i = 0; i < 100; i++) {
     db.foo.insert({x:i});
 }
diff --git a/jstests/sharding/auto2.js b/jstests/sharding/auto2.js
index f803f4000f7..ff4c44b2b4f 100644
--- a/jstests/sharding/auto2.js
+++ b/jstests/sharding/auto2.js
@@ -6,6 +6,9 @@ s.adminCommand( { enablesharding : "test" } );
 s.ensurePrimaryShard('test', 'shard0001');
 s.adminCommand( { shardcollection : "test.foo" , key : { num : 1 } } );
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(s.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 bigString = "";
 while ( bigString.length < 1024 * 50 )
     bigString += "asocsancdnsjfnsdnfsjdhfasdfasdfasdfnsadofnsadlkfnsaldknfsad";
diff --git a/jstests/sharding/coll_epoch_test1.js b/jstests/sharding/coll_epoch_test1.js
index 3fd97e8105f..70571255e62 100644
--- a/jstests/sharding/coll_epoch_test1.js
+++ b/jstests/sharding/coll_epoch_test1.js
@@ -4,6 +4,11 @@ var st = new ShardingTest({ shards : 3, mongos : 3, verbose : 1 })
 // Stop balancer, it'll interfere
 st.stopBalancer()
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(st.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+assert.commandWorked(st.s1.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+assert.commandWorked(st.s2.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 // Use separate mongoses for admin, inserting data, and validating results, so no
 // single-mongos tricks will work
 var insertMongos = st.s2
diff --git a/jstests/sharding/csrs_upgrade.js b/jstests/sharding/csrs_upgrade.js
index f0428081a67..88a48f89a75 100644
--- a/jstests/sharding/csrs_upgrade.js
+++ b/jstests/sharding/csrs_upgrade.js
@@ -88,6 +88,10 @@ var st;
         }
     });
 
+    // TODO: SERVER-20194. This test forces use of the old mongos query path.
+    assert.commandWorked(st.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+    assert.commandWorked(st.s1.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
     var shardConfigs = st.s0.getCollection("config.shards").find().toArray();
     assert.eq(2, shardConfigs.length);
     var shard0Name = shardConfigs[0]._id;
diff --git a/jstests/sharding/features3.js b/jstests/sharding/features3.js
index 16cb955b696..38082001f24 100644
--- a/jstests/sharding/features3.js
+++ b/jstests/sharding/features3.js
@@ -16,6 +16,9 @@ db.foo.drop();
 // stop the balancer
 s.stopBalancer()
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(s.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 // shard test.foo and add a split point
 s.adminCommand({enablesharding: "test"});
 s.ensurePrimaryShard('test', 'shard0001');
diff --git a/jstests/sharding/mongos_rs_shard_failure_tolerance.js b/jstests/sharding/mongos_rs_shard_failure_tolerance.js
index 6cd99a1bbc3..35d41fdd0bc 100644
--- a/jstests/sharding/mongos_rs_shard_failure_tolerance.js
+++ b/jstests/sharding/mongos_rs_shard_failure_tolerance.js
@@ -16,6 +16,9 @@ var options = {rs : true, rsOptions : { nodes : 2 }};
 var st = new ShardingTest({shards : 3, mongos : 1, other : options});
 st.stopBalancer();
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(st.s.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 var mongos = st.s0;
 var admin = mongos.getDB( "admin" );
 var shards = mongos.getDB( "config" ).shards.find().toArray();
diff --git a/jstests/sharding/remove2.js b/jstests/sharding/remove2.js
index 74f760050db..c0c622a2974 100644
--- a/jstests/sharding/remove2.js
+++ b/jstests/sharding/remove2.js
@@ -78,6 +78,9 @@ var st = new ShardingTest({ shards: {
                                 enableBalancer: true
                             }});
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(st.s.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 // Pending resolution of SERVER-8598, we need to wait for deletion after chunk migrations to avoid
 // a pending delete re-creating a database after it was dropped.
 st.s.getDB("config").settings.update( { _id: "balancer" },
diff --git a/jstests/sharding/shard_insert_getlasterror_w2.js b/jstests/sharding/shard_insert_getlasterror_w2.js
index c858933a449..af042d3e878 100644
--- a/jstests/sharding/shard_insert_getlasterror_w2.js
+++ b/jstests/sharding/shard_insert_getlasterror_w2.js
@@ -25,6 +25,12 @@
     };
     var shardingTest = new ShardingTest(shardingTestConfig);
 
+    // TODO: SERVER-20194. This test forces use of the old mongos query path.
+    assert.commandWorked(shardingTest.s0.adminCommand({
+        setParameter: 1,
+        useClusterClientCursor: false
+    }));
+
     // Get connection to the individual shard
     var replSet1 = shardingTest.rs0;
 
diff --git a/jstests/sharding/shard_kill_and_pooling.js b/jstests/sharding/shard_kill_and_pooling.js
index 6bfaf70a6af..530e2157e8b 100644
--- a/jstests/sharding/shard_kill_and_pooling.js
+++ b/jstests/sharding/shard_kill_and_pooling.js
@@ -10,6 +10,9 @@ var killWith = (test == 0 ? 15 : 9);
 
 var st = new ShardingTest({shards : 2, mongos : 1});
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(st.s.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 // Stop balancer to eliminate weird conn stuff
 st.stopBalancer();
 
diff --git a/jstests/sharding/sharding_state_after_stepdown.js b/jstests/sharding/sharding_state_after_stepdown.js
index a93578ecfa8..eebe2058142 100644
--- a/jstests/sharding/sharding_state_after_stepdown.js
+++ b/jstests/sharding/sharding_state_after_stepdown.js
@@ -7,6 +7,9 @@ var options = { rs : true, rsOptions : { nodes : 1 } };
 var st = new ShardingTest({ shards : 2, mongos : 1, other : options });
 st.stopBalancer();
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(st.s.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 var mongos = st.s0;
 var admin = mongos.getDB("admin");
 var shards = mongos.getCollection("config.shards").find().toArray();
diff --git a/jstests/sharding/zero_shard_version.js b/jstests/sharding/zero_shard_version.js
index 876f28a95d7..7c02cbb7fb2 100644
--- a/jstests/sharding/zero_shard_version.js
+++ b/jstests/sharding/zero_shard_version.js
@@ -6,6 +6,12 @@
 var st = new ShardingTest({ shards: 2, mongos: 4 });
 st.stopBalancer();
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(st.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+assert.commandWorked(st.s1.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+assert.commandWorked(st.s2.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+assert.commandWorked(st.s3.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 var testDB_s0 = st.s.getDB('test');
 testDB_s0.adminCommand({ enableSharding: 'test' });
 testDB_s0.adminCommand({ movePrimary: 'test', to: 'shard0001' });