From d0afa1f20446136a8ca568b32d73adcb6d5df228 Mon Sep 17 00:00:00 2001
From: Julius Park <Juliusgeo@gmail.com>
Date: Thu, 17 Feb 2022 14:23:37 -0800
Subject: [PATCH 1/5] PYTHON-3088 [v3.13] Update load balancer tests to support
 dedicated load balancer port (#870)

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

(cherry picked from commit 341d489)
(cherry picked from commit 1443d7687edb9f6f62a182c0d3b5e9386b4a568c)
---
 .evergreen/config.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 7cc7d51a51..183a090827 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1920,6 +1920,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
@@ -2635,8 +2639,8 @@ buildvariants:
 
 - matrix_name: "load-balancer"
   matrix_spec:
-    platform: ubuntu-18.04
-    mongodb-version: ["5.0", "latest"]
+    platform: awslinux
+    mongodb-version: ["rapid", "latest"]
     auth-ssl: "*"
     python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3.6", "pypy3.7"]
     loadbalancer: "*"

From 9b39bf1022d488136afd61380e6ce8f55512d8d9 Mon Sep 17 00:00:00 2001
From: julius <juliusgeo@gmail.com>
Date: Thu, 17 Feb 2022 14:40:56 -0800
Subject: [PATCH 2/5] shouldn't change linux runner version

---
 .evergreen/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 183a090827..6e475a5855 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2639,7 +2639,7 @@ buildvariants:
 
 - matrix_name: "load-balancer"
   matrix_spec:
-    platform: awslinux
+    platform: ubuntu-18.04
     mongodb-version: ["rapid", "latest"]
     auth-ssl: "*"
     python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3.6", "pypy3.7"]

From ab3f36252aa1f119c6d868d90a36704515a32f09 Mon Sep 17 00:00:00 2001
From: julius <juliusgeo@gmail.com>
Date: Thu, 17 Feb 2022 14:43:55 -0800
Subject: [PATCH 3/5] remove other instance where we don't need LOAD_BALANCER:
 true

---
 .evergreen/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 6e475a5855..36731dfe56 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1718,8 +1718,6 @@ tasks:
             TOPOLOGY: "sharded_cluster"
             LOAD_BALANCER: true
         - func: "run load-balancer"
-          vars:
-            LOAD_BALANCER: true
         - func: "run tests"
 # }}}
     - name: "coverage-report"

From dbf91d85b31d133a9381beae704246b1cb4752c1 Mon Sep 17 00:00:00 2001
From: julius <juliusgeo@gmail.com>
Date: Thu, 17 Feb 2022 16:25:14 -0800
Subject: [PATCH 4/5] remove references to service ID

---
 pymongo/pool.py | 5 -----
 1 file changed, 5 deletions(-)

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(

From 7adf4d8b710f7245b05db96381b67a78dc2eaaa3 Mon Sep 17 00:00:00 2001
From: julius <juliusgeo@gmail.com>
Date: Thu, 17 Feb 2022 16:34:17 -0800
Subject: [PATCH 5/5] remove version that was added erroneously

---
 .evergreen/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 36731dfe56..d33a7ae15c 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1714,7 +1714,6 @@ tasks:
       commands:
         - func: "bootstrap mongo-orchestration"
           vars:
-            VERSION: "latest"
             TOPOLOGY: "sharded_cluster"
             LOAD_BALANCER: true
         - func: "run load-balancer"