SERVER-20067 SERVER-19572 set readMode in shell based on wire version

"compatibility" readMode now causes the shell to detect whether or not
to use find/getMore commands based on wire version. "commands" mode
forces use of the find/getMore commands, and "legacy" mode forces uses
of legacy OP_QUERY/OP_GET_MORE reads.

Also configures tests to force use of "commands" or "legacy" mode as
appropriate.

28 files changed, 40 insertions, 2 deletions

diff --git a/buildscripts/resmokeconfig/suites/aggregation.yml b/buildscripts/resmokeconfig/suites/aggregation.yml
index 6bef7c88600..7db3497afb8 100644
--- a/buildscripts/resmokeconfig/suites/aggregation.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation.yml
@@ -7,7 +7,9 @@ selector:
 
 executor:
   js_test:
-    config: {}
+    config:
+      shell_options:
+        readMode: commands
     hooks:
     - class: CleanEveryN
       n: 20
diff --git a/buildscripts/resmokeconfig/suites/aggregation_auth.yml b/buildscripts/resmokeconfig/suites/aggregation_auth.yml
index 5b978cb342c..7c0a83d9a97 100644
--- a/buildscripts/resmokeconfig/suites/aggregation_auth.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_auth.yml
@@ -28,6 +28,7 @@ executor:
         authenticationMechanism: SCRAM-SHA-1
         password: *keyFileData
         username: __system
+        readMode: commands
     hooks:
     - class: CleanEveryN
       n: 20
diff --git a/buildscripts/resmokeconfig/suites/audit.yml b/buildscripts/resmokeconfig/suites/audit.yml
index 8df96559d01..ba62241e73b 100644
--- a/buildscripts/resmokeconfig/suites/audit.yml
+++ b/buildscripts/resmokeconfig/suites/audit.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/bulk_gle_passthrough.yml b/buildscripts/resmokeconfig/suites/bulk_gle_passthrough.yml
index 532ee970a2e..edd865044f6 100644
--- a/buildscripts/resmokeconfig/suites/bulk_gle_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/bulk_gle_passthrough.yml
@@ -9,6 +9,7 @@ executor:
   js_test:
     config:
       shell_options:
+        readMode: legacy
         writeMode: legacy
     hooks:
     - class: CleanEveryN
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded.yml
index 132aba312c5..b5bd8b7169e 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/decimal.yml b/buildscripts/resmokeconfig/suites/decimal.yml
index 3992d1568e2..b97447ebe13 100644
--- a/buildscripts/resmokeconfig/suites/decimal.yml
+++ b/buildscripts/resmokeconfig/suites/decimal.yml
@@ -5,6 +5,9 @@ selector:
 
 executor:
   js_test:
+    config:
+      shell_options:
+        readMode: commands
     hooks:
     - class: CleanEveryN
       n: 20
diff --git a/buildscripts/resmokeconfig/suites/ese.yml b/buildscripts/resmokeconfig/suites/ese.yml
index 965bff860a8..60b25db5509 100644
--- a/buildscripts/resmokeconfig/suites/ese.yml
+++ b/buildscripts/resmokeconfig/suites/ese.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/failpoints.yml b/buildscripts/resmokeconfig/suites/failpoints.yml
index 3d7c2c0f24f..5943ce0f49e 100644
--- a/buildscripts/resmokeconfig/suites/failpoints.yml
+++ b/buildscripts/resmokeconfig/suites/failpoints.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/failpoints_auth.yml b/buildscripts/resmokeconfig/suites/failpoints_auth.yml
index 6b23bb2c96b..04c514080be 100644
--- a/buildscripts/resmokeconfig/suites/failpoints_auth.yml
+++ b/buildscripts/resmokeconfig/suites/failpoints_auth.yml
@@ -23,3 +23,4 @@ executor:
             keyFile: *keyFile
             keyFileData: *keyFileData
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/gle_auth.yml b/buildscripts/resmokeconfig/suites/gle_auth.yml
index 00c1f2e8226..2f2ec4e97af 100644
--- a/buildscripts/resmokeconfig/suites/gle_auth.yml
+++ b/buildscripts/resmokeconfig/suites/gle_auth.yml
@@ -29,6 +29,7 @@ executor:
         authenticationMechanism: SCRAM-SHA-1
         password: *keyFileData
         username: __system
+        readMode: commands
     hooks:
     - class: CleanEveryN
       n: 20
diff --git a/buildscripts/resmokeconfig/suites/gle_auth_basics_passthrough.yml b/buildscripts/resmokeconfig/suites/gle_auth_basics_passthrough.yml
index 7f40eb75d1f..ebbd50f5f0c 100644
--- a/buildscripts/resmokeconfig/suites/gle_auth_basics_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/gle_auth_basics_passthrough.yml
@@ -23,6 +23,7 @@ executor:
         authenticationMechanism: SCRAM-SHA-1
         password: *keyFileData
         username: __system
+        readMode: commands
     fixture:
       class: MongoDFixture
       mongod_options:
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz.yml b/buildscripts/resmokeconfig/suites/jstestfuzz.yml
index c58774c3160..8b9d6774cbf 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz.yml
@@ -5,6 +5,9 @@ selector:
 
 executor:
   js_test:
+    config:
+      shell_options:
+        readMode: commands
     fixture:
       class: MongoDFixture
       mongod_options:
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index 131ef0b758b..6077bd9a037 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -9,4 +9,5 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: legacy
         writeMode: legacy
diff --git a/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml b/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml
index e9c9069545e..c6b6ebcfe84 100644
--- a/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml
+++ b/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml
@@ -13,6 +13,9 @@ selector:
 
 executor:
   js_test:
+    config:
+      shell_options:
+        readMode: commands
     hooks:
     - class: CleanEveryN
       n: 20
diff --git a/buildscripts/resmokeconfig/suites/no_server.yml b/buildscripts/resmokeconfig/suites/no_server.yml
index 95a8b6a4c0f..1a2d5edec99 100644
--- a/buildscripts/resmokeconfig/suites/no_server.yml
+++ b/buildscripts/resmokeconfig/suites/no_server.yml
@@ -3,3 +3,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/rlp.yml b/buildscripts/resmokeconfig/suites/rlp.yml
index feb3aaded27..917da161490 100644
--- a/buildscripts/resmokeconfig/suites/rlp.yml
+++ b/buildscripts/resmokeconfig/suites/rlp.yml
@@ -5,6 +5,9 @@ selector:
 
 executor:
   js_test:
+    config:
+      shell_options:
+        readMode: commands
     hooks:
     - class: CleanEveryN
       n: 20
diff --git a/buildscripts/resmokeconfig/suites/sasl.yml b/buildscripts/resmokeconfig/suites/sasl.yml
index 0d75791d1e6..3333248da7c 100644
--- a/buildscripts/resmokeconfig/suites/sasl.yml
+++ b/buildscripts/resmokeconfig/suites/sasl.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/sharding.yml b/buildscripts/resmokeconfig/suites/sharding.yml
index cbfbb2b28ab..cb084fdbf8d 100644
--- a/buildscripts/resmokeconfig/suites/sharding.yml
+++ b/buildscripts/resmokeconfig/suites/sharding.yml
@@ -12,3 +12,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth.yml b/buildscripts/resmokeconfig/suites/sharding_auth.yml
index 50874679ea8..37fa3fc58cd 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth.yml
@@ -32,3 +32,4 @@ executor:
             keyFile: *keyFile
             keyFileData: *keyFileData
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml
index e962bfbee3d..2c6887ba8bf 100644
--- a/buildscripts/resmokeconfig/suites/sharding_ese.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_ese.yml
@@ -20,3 +20,4 @@ executor:
           TestData:
             enableEncryption: ''
             encryptionKeyFile: *keyFile
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml
index d081d1a8eb9..fa6d00d884d 100644
--- a/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_gle_auth_basics_passthrough.yml
@@ -27,6 +27,7 @@ executor:
         authenticationMechanism: SCRAM-SHA-1
         password: *keyFileData
         username: __system
+        readMode: commands
 
     fixture:
       class: ShardedClusterFixture
diff --git a/buildscripts/resmokeconfig/suites/sharding_legacy.yml b/buildscripts/resmokeconfig/suites/sharding_legacy.yml
index bdcfbba816b..b0937c27e54 100644
--- a/buildscripts/resmokeconfig/suites/sharding_legacy.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_legacy.yml
@@ -15,3 +15,4 @@ executor:
           TestData:
             useLegacyConfigServers: true
         nodb: ''
+        readMode: legacy
diff --git a/buildscripts/resmokeconfig/suites/snmp.yml b/buildscripts/resmokeconfig/suites/snmp.yml
index 329f06b1020..eb9003e15a4 100644
--- a/buildscripts/resmokeconfig/suites/snmp.yml
+++ b/buildscripts/resmokeconfig/suites/snmp.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/ssl.yml b/buildscripts/resmokeconfig/suites/ssl.yml
index a1885a707d5..06fbd48aef5 100644
--- a/buildscripts/resmokeconfig/suites/ssl.yml
+++ b/buildscripts/resmokeconfig/suites/ssl.yml
@@ -13,3 +13,4 @@ executor:
         sslAllowInvalidCertificates: ''
         sslCAFile: jstests/libs/ca.pem
         sslPEMKeyFile: jstests/libs/client.pem
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/ssl_special.yml b/buildscripts/resmokeconfig/suites/ssl_special.yml
index 340baad9534..3f48f2d217a 100644
--- a/buildscripts/resmokeconfig/suites/ssl_special.yml
+++ b/buildscripts/resmokeconfig/suites/ssl_special.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/tool.yml b/buildscripts/resmokeconfig/suites/tool.yml
index 37ffb69fd73..6b756b62083 100644
--- a/buildscripts/resmokeconfig/suites/tool.yml
+++ b/buildscripts/resmokeconfig/suites/tool.yml
@@ -9,3 +9,4 @@ executor:
     config:
       shell_options:
         nodb: ''
+        readMode: commands
diff --git a/buildscripts/resmokeconfig/suites/with_server.yml b/buildscripts/resmokeconfig/suites/with_server.yml
index c87cad9f8dd..28347632778 100644
--- a/buildscripts/resmokeconfig/suites/with_server.yml
+++ b/buildscripts/resmokeconfig/suites/with_server.yml
@@ -1,5 +1,8 @@
 executor:
   js_test:
+    config:
+      shell_options:
+        readMode: commands
     fixture:
       class: MongoDFixture
       mongod_options:
diff --git a/buildscripts/resmokelib/parser.py b/buildscripts/resmokelib/parser.py
index 27d4772f705..f3f11012fb3 100644
--- a/buildscripts/resmokelib/parser.py
+++ b/buildscripts/resmokelib/parser.py
@@ -149,7 +149,7 @@ def parse_command_line():
                             " --shuffle option for producing a consistent test execution order."))
 
     parser.add_option("--shellReadMode", type="choice", action="store", dest="shell_read_mode",
-                      choices=("commands", "compatibility"), metavar="READ_MODE",
+                      choices=("commands", "compatibility", "legacy"), metavar="READ_MODE",
                       help="The read mode used by the mongo shell.")
 
     parser.add_option("--shellWriteMode", type="choice", action="store", dest="shell_write_mode",