diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 7cc7d51a51..d33a7ae15c 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1714,12 +1714,9 @@ 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" @@ -1920,6 +1917,10 @@ axes: display_name: "MongoDB latest" variables: VERSION: "latest" + - id: "rapid" + display_name: "MongoDB rapid" + variables: + VERSION: "rapid" # Choice of Python runtime version - id: python-version @@ -2636,7 +2637,7 @@ buildvariants: - matrix_name: "load-balancer" matrix_spec: platform: ubuntu-18.04 - mongodb-version: ["5.0", "latest"] + mongodb-version: ["rapid", "latest"] auth-ssl: "*" python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3.6", "pypy3.7"] loadbalancer: "*" diff --git a/pymongo/pool.py b/pymongo/pool.py index aea7e8adfc..1440217fbf 100644 --- a/pymongo/pool.py +++ b/pymongo/pool.py @@ -635,8 +635,6 @@ def _hello(self, cluster_time, topology_version, heartbeat_frequency, all_creden cmd["speculativeAuthenticate"] = auth_ctx.speculate_command() doc = self.command("admin", cmd, publish_events=False, exhaust_allowed=awaitable) - if not self.opts.load_balanced: - doc.pop("serviceId", None) hello = Hello(doc, awaitable=awaitable) self.is_writable = hello.is_writable self.max_wire_version = hello.max_wire_version @@ -673,9 +671,6 @@ def _next_reply(self): unpacked_docs = reply.unpack_response() response_doc = unpacked_docs[0] helpers._check_command_response(response_doc, self.max_wire_version) - # Remove after PYTHON-2712. - if not self.opts.load_balanced: - response_doc.pop("serviceId", None) return response_doc def command(