PYTHON-2629 Use hello command when API Version is declared (#610)

PYTHON-2697 Update CMAP runner to ignore extra events

(cherry picked from commit f64b563)

Author: ShaneHarvey

pymongo/auth.py

@@ -579,9 +579,8 @@ def _authenticate_default(credentials, sock_info):
             mechs = sock_info.negotiated_mechanisms[credentials]
         else:
             source = credentials.source
-            cmd = SON([
-                ('ismaster', 1),
-                ('saslSupportedMechs', source + '.' + credentials.username)])
+            cmd = sock_info.hello_cmd()
+            cmd['saslSupportedMechs'] = source + '.' + credentials.username
             mechs = sock_info.command(
                 source, cmd, publish_events=False).get(
                 'saslSupportedMechs', [])

pymongo/compression_support.py

@@ -34,10 +34,11 @@
 except ImportError:
     _HAVE_ZSTD = False
 
+from pymongo.hello import HelloCompat
 from pymongo.monitoring import _SENSITIVE_COMMANDS
 
 _SUPPORTED_COMPRESSORS = set(["snappy", "zlib", "zstd"])
-_NO_COMPRESSION = set(['ismaster'])
+_NO_COMPRESSION = set([HelloCompat.CMD, HelloCompat.LEGACY_CMD])
 _NO_COMPRESSION.update(_SENSITIVE_COMMANDS)
 
 

pymongo/hello.py

@@ -0,0 +1,22 @@
+# Copyright 2021-present MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Helpers for the 'hello' and legacy hello commands."""
+
+
+class HelloCompat:
+    CMD = 'hello'
+    LEGACY_CMD = 'ismaster'
+    PRIMARY = 'isWritablePrimary'
+    LEGACY_PRIMARY = 'ismaster'

pymongo/ismaster.py

@@ -18,6 +18,7 @@
 
 from bson.py3compat import imap
 from pymongo import common
+from pymongo.hello import HelloCompat
 from pymongo.server_type import SERVER_TYPE
 
 
@@ -31,7 +32,9 @@ def _get_server_type(doc):
     elif doc.get('setName'):
         if doc.get('hidden'):
             return SERVER_TYPE.RSOther
-        elif doc.get('ismaster'):
+        elif doc.get(HelloCompat.PRIMARY):
+            return SERVER_TYPE.RSPrimary
+        elif doc.get(HelloCompat.LEGACY_PRIMARY):
             return SERVER_TYPE.RSPrimary
         elif doc.get('secondary'):
             return SERVER_TYPE.RSSecondary

pymongo/pool.py

@@ -51,6 +51,7 @@
                             NotMasterError,
                             OperationFailure,
                             PyMongoError)
+from pymongo.hello import HelloCompat
 from pymongo.ismaster import IsMaster
 from pymongo.monotonic import time as _time
 from pymongo.monitoring import (ConnectionCheckOutFailedReason,
@@ -549,12 +550,18 @@ def __init__(self, sock, pool, address, id):
         self.opts = pool.opts
         self.more_to_come = False
 
+    def hello_cmd(self):
+        if self.opts.server_api:
+            return SON([(HelloCompat.CMD, 1)])
+        else:
+            return SON([(HelloCompat.LEGACY_CMD, 1)])
+
     def ismaster(self, all_credentials=None):
         return self._ismaster(None, None, None, all_credentials)
 
     def _ismaster(self, cluster_time, topology_version,
                   heartbeat_frequency, all_credentials):
-        cmd = SON([('ismaster', 1)])
+        cmd = self.hello_cmd()
         performing_handshake = not self.performed_handshake
         awaitable = False
         if performing_handshake:

test/cmap/pool-checkout-no-idle.json

@@ -20,6 +20,16 @@
     },
     {
       "name": "checkOut"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionClosed",
+      "count": 1
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckedOut",
+      "count": 2
     }
   ],
   "events": [
@@ -43,11 +53,6 @@
       "connectionId": 1,
       "reason": "idle",
       "address": 42
-    },
-    {
-      "type": "ConnectionCheckedOut",
-      "connectionId": 2,
-      "address": 42
     }
   ],
   "ignore": [

test/cmap/pool-checkout-no-stale.json

@@ -16,6 +16,16 @@
     },
     {
       "name": "checkOut"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionClosed",
+      "count": 1
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckedOut",
+      "count": 2
     }
   ],
   "events": [
@@ -43,11 +53,6 @@
       "connectionId": 1,
       "reason": "stale",
       "address": 42
-    },
-    {
-      "type": "ConnectionCheckedOut",
-      "connectionId": 2,
-      "address": 42
     }
   ],
   "ignore": [

test/discovery_and_monitoring/errors/write_errors_ignored.json

@@ -63,7 +63,8 @@
             "writeErrors": [
               {
                 "errmsg": "NotMasterNoSlaveOk",
-                "code": 13435
+                "code": 13435,
+                "index": 0
               }
             ]
           }

test/discovery_and_monitoring_integration/connectTimeoutMS.json

@@ -42,7 +42,8 @@
               },
               "data": {
                 "failCommands": [
-                  "isMaster"
+                  "isMaster",
+                  "hello"
                 ],
                 "appName": "connectTimeoutMS=0",
                 "blockConnection": true,

test/discovery_and_monitoring_integration/isMaster-command-error.json

@@ -1,7 +1,7 @@
 {
   "runOn": [
     {
-      "minServerVersion": "4.4"
+      "minServerVersion": "4.9"
     }
   ],
   "database_name": "sdam-tests",
@@ -17,7 +17,8 @@
         },
         "data": {
           "failCommands": [
-            "isMaster"
+            "isMaster",
+            "hello"
           ],
           "appName": "commandErrorHandshakeTest",
           "closeConnection": false,
@@ -128,7 +129,8 @@
               },
               "data": {
                 "failCommands": [
-                  "isMaster"
+                  "isMaster",
+                  "hello"
                 ],
                 "appName": "commandErrorCheckTest",
                 "closeConnection": false,