Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 542766e

Browse files
PYTHON-3088 [4.0] Test rapid releases with load balancers (#880)
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port (#870) (cherry picked from commit 1443d76)
1 parent cbae04f commit 542766e

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: "coverage-report"
@@ -1920,6 +1917,10 @@ axes:
19201917
display_name: "MongoDB latest"
19211918
variables:
19221919
VERSION: "latest"
1920+
- id: "rapid"
1921+
display_name: "MongoDB rapid"
1922+
variables:
1923+
VERSION: "rapid"
19231924

19241925
# Choice of Python runtime version
19251926
- 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: ["3.6", "3.7", "3.8", "3.9", "pypy3.6", "pypy3.7"]
26422643
loadbalancer: "*"

‎pymongo/pool.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -635,8 +635,6 @@ def _hello(self, cluster_time, topology_version, heartbeat_frequency, all_creden
635635
cmd["speculativeAuthenticate"] = auth_ctx.speculate_command()
636636

637637
doc = self.command("admin", cmd, publish_events=False, exhaust_allowed=awaitable)
638-
if not self.opts.load_balanced:
639-
doc.pop("serviceId", None)
640638
hello = Hello(doc, awaitable=awaitable)
641639
self.is_writable = hello.is_writable
642640
self.max_wire_version = hello.max_wire_version
@@ -673,9 +671,6 @@ def _next_reply(self):
673671
unpacked_docs = reply.unpack_response()
674672
response_doc = unpacked_docs[0]
675673
helpers._check_command_response(response_doc, self.max_wire_version)
676-
# Remove after PYTHON-2712.
677-
if not self.opts.load_balanced:
678-
response_doc.pop("serviceId", None)
679674
return response_doc
680675

681676
def command(

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /