Skip to content

Commit 1e67a05

Browse files
juliusgeoblink1073
authored andcommitted
PYTHON-3088 Test rapid releases with load balancers (mongodb#885)
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port (mongodb#870) (cherry picked from commit 341d489)
1 parent 56c6e9d commit 1e67a05

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.evergreen/config.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,12 +1714,9 @@ tasks:
17141714
commands:
17151715
- func: "bootstrap mongo-orchestration"
17161716
vars:
1717-
VERSION: "latest"
17181717
TOPOLOGY: "sharded_cluster"
17191718
LOAD_BALANCER: true
17201719
- func: "run load-balancer"
1721-
vars:
1722-
LOAD_BALANCER: true
17231720
- func: "run tests"
17241721

17251722
- name: "test-fips-standalone"
@@ -1937,6 +1934,10 @@ axes:
19371934
display_name: "MongoDB latest"
19381935
variables:
19391936
VERSION: "latest"
1937+
- id: "rapid"
1938+
display_name: "MongoDB rapid"
1939+
variables:
1940+
VERSION: "rapid"
19401941

19411942
# Choice of Python runtime version
19421943
- id: python-version
@@ -2636,7 +2637,7 @@ buildvariants:
26362637
- matrix_name: "load-balancer"
26372638
matrix_spec:
26382639
platform: ubuntu-18.04
2639-
mongodb-version: ["5.0", "latest"]
2640+
mongodb-version: ["rapid", "latest"]
26402641
auth-ssl: "*"
26412642
python-version: "*"
26422643
loadbalancer: "*"

pymongo/pool.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,6 @@ def _hello(self, cluster_time, topology_version, heartbeat_frequency):
630630
auth_ctx = None
631631

632632
doc = self.command("admin", cmd, publish_events=False, exhaust_allowed=awaitable)
633-
if not self.opts.load_balanced:
634-
doc.pop("serviceId", None)
635633
hello = Hello(doc, awaitable=awaitable)
636634
self.is_writable = hello.is_writable
637635
self.max_wire_version = hello.max_wire_version
@@ -676,9 +674,6 @@ def _next_reply(self):
676674
unpacked_docs = reply.unpack_response()
677675
response_doc = unpacked_docs[0]
678676
helpers._check_command_response(response_doc, self.max_wire_version)
679-
# Remove after PYTHON-2712.
680-
if not self.opts.load_balanced:
681-
response_doc.pop("serviceId", None)
682677
return response_doc
683678

684679
def command(

0 commit comments

Comments
 (0)