PYTHON-3088 Update load balancer tests to support dedicated load balancer port (mongodb#866)

(cherry picked from commit 341d489)

Author: juliusgeo

.evergreen/config.yml

@@ -291,6 +291,7 @@ functions:
             DISABLE_TEST_COMMANDS=${DISABLE_TEST_COMMANDS} \
             ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
             REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
+            LOAD_BALANCER=${LOAD_BALANCER} \
             bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with the MONGODB_URI for the cluster
     - command: expansions.update
@@ -423,6 +424,7 @@ functions:
           fi
           if [ -n "${test_loadbalancer}" ]; then
             export TEST_LOADBALANCER=1
+            export LOAD_BALANCER=1
             export SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}"
             export MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}"
           fi
@@ -1770,8 +1772,12 @@ tasks:
       commands:
         - func: "bootstrap mongo-orchestration"
           vars:
+            VERSION: "latest"
             TOPOLOGY: "sharded_cluster"
+            LOAD_BALANCER: true
         - func: "run load-balancer"
+          vars:
+            LOAD_BALANCER: true
         - func: "run tests"
 # }}}
     - name: "coverage-report"

pymongo/pool.py

@@ -220,9 +220,6 @@ def _set_keepalive_times(sock):
 # main thread, to avoid the deadlock. See PYTHON-607.
 u'foo'.encode('idna')
 
-# Remove after PYTHON-2712
-_MOCK_SERVICE_ID = False
-
 
 def _raise_connection_failure(address, error, msg_prefix=None):
     """Convert a socket.error to ConnectionFailure and raise it."""
@@ -584,12 +581,7 @@ def _hello(self, cluster_time, topology_version,
         if auth_ctx:
             cmd['speculativeAuthenticate'] = auth_ctx.speculate_command()
 
-        doc = self.command('admin', cmd, publish_events=False,
-                           exhaust_allowed=awaitable)
-        # PYTHON-2712 will remove this topologyVersion fallback logic.
-        if self.opts.load_balanced and _MOCK_SERVICE_ID:
-            process_id = doc.get('topologyVersion', {}).get('processId')
-            doc.setdefault('serviceId', process_id)
+        doc = self.command("admin", cmd, publish_events=False, exhaust_allowed=awaitable)
         if not self.opts.load_balanced:
             doc.pop('serviceId', None)
         hello = IsMaster(doc, awaitable=awaitable)

test/__init__.py

@@ -99,13 +99,10 @@
 SINGLE_MONGOS_LB_URI = os.environ.get("SINGLE_MONGOS_LB_URI")
 MULTI_MONGOS_LB_URI = os.environ.get("MULTI_MONGOS_LB_URI")
 if TEST_LOADBALANCER:
-    # Remove after PYTHON-2712
-    from pymongo import pool
-    pool._MOCK_SERVICE_ID = True
-    res = parse_uri(SINGLE_MONGOS_LB_URI)
-    host, port = res['nodelist'][0]
-    db_user = res['username'] or db_user
-    db_pwd = res['password'] or db_pwd
+    res = parse_uri(SINGLE_MONGOS_LB_URI or "")
+    host, port = res["nodelist"][0]
+    db_user = res["username"] or db_user
+    db_pwd = res["password"] or db_pwd
 elif TEST_SERVERLESS:
     TEST_LOADBALANCER = True
     res = parse_uri(SINGLE_MONGOS_LB_URI)