rework applying patch logic so that they're one at a time -- currently if one fails, then the rest of the patches don't get applied

sleepyStick · sleepyStick · commit dd659917394e · 2026-06-24T14:18:14.000-07:00
diff --git a/.evergreen/scripts/resync-all-specs.py b/.evergreen/scripts/resync-all-specs.py
@@ -37,29 +37,29 @@ def apply_patches(errored):
         ["bash", "./.evergreen/remove-unimplemented-tests.sh"],  # noqa: S607
         check=True,
     )
-    try:
-        # Avoid shell=True by passing arguments as a list.
-        # Note: glob expansion doesn't work in shell=False, so we use a list of files.
-        spec_patch_dir = pathlib.Path("./.evergreen/spec-patch/")
-        patches = [str(p) for p in spec_patch_dir.glob("*.patch")]
-        patches += [str(p) for p in (spec_patch_dir / "permanent").glob("*.patch")]
-        if patches:
-            for patch in patches:
-                print(f"Applying patch {patch}")
-            subprocess.run(  # noqa: S603
-                [  # noqa: S607
-                    "git",
-                    "apply",
-                    "-R",
-                    "--allow-empty",
-                    "--whitespace=fix",
-                    *patches,
-                ],
-                check=True,
-                stderr=subprocess.PIPE,
-            )
-    except CalledProcessError as exc:
-        errored["applying patches"] = exc.stderr
+    # Avoid shell=True by passing arguments as a list.
+    # Note: glob expansion doesn't work in shell=False, so we use a list of files.
+    spec_patch_dir = pathlib.Path("./.evergreen/spec-patch/")
+    patches = [str(p) for p in spec_patch_dir.glob("*.patch")]
+    patches += [str(p) for p in (spec_patch_dir / "permanent").glob("*.patch")]
+    if patches:
+        for patch in patches:
+            print(f"Applying patch {patch}")
+            try:
+                subprocess.run(  # noqa: S603
+                    [  # noqa: S607
+                        "git",
+                        "apply",
+                        "-R",
+                        "--allow-empty",
+                        "--whitespace=fix",
+                        str(patch),
+                    ],
+                    check=True,
+                    stderr=subprocess.PIPE,
+                )
+            except CalledProcessError as exc:
+                errored[f"{patch}"] = exc.stderr
 
 
 def check_new_spec_directories(directory: pathlib.Path) -> list[str]:
diff --git a/test/load_balancer/cursors.json b/test/load_balancer/cursors.json
@@ -385,7 +385,7 @@
       ]
     },
     {
-      "description": "pinned connections are not returned after an network error during getMore",
+      "description": "pinned connections are returned after an network error during getMore",
       "operations": [
         {
           "name": "failPoint",
@@ -449,7 +449,7 @@
           "object": "testRunner",
           "arguments": {
             "client": "client0",
-            "connections": 1
+            "connections": 0
           }
         },
         {
@@ -677,7 +677,7 @@
       ]
     },
     {
-      "description": "pinned connections are not returned to the pool after a non-network error on getMore",
+      "description": "pinned connections are returned to the pool after a non-network error on getMore",
       "operations": [
         {
           "name": "failPoint",
@@ -733,7 +733,7 @@
           "object": "testRunner",
           "arguments": {
             "client": "client0",
-            "connections": 1
+            "connections": 0
           }
         },
         {
diff --git a/test/load_balancer/sdam-error-handling.json b/test/load_balancer/sdam-error-handling.json
@@ -372,9 +372,6 @@
             {
               "connectionCreatedEvent": {}
             },
-            {
-              "poolClearedEvent": {}
-            },
             {
               "connectionClosedEvent": {
                 "reason": "error"
@@ -384,6 +381,9 @@
               "connectionCheckOutFailedEvent": {
                 "reason": "connectionError"
               }
+            },
+            {
+              "poolClearedEvent": {}
             }
           ]
         }
diff --git a/test/server_selection_logging/operation-id.json b/test/server_selection_logging/operation-id.json
@@ -197,7 +197,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
@@ -383,7 +383,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/replica-set.json b/test/server_selection_logging/replica-set.json
@@ -184,7 +184,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/sharded.json
@@ -193,7 +193,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/standalone.json b/test/server_selection_logging/standalone.json
@@ -191,7 +191,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@`
`385`	`385`	`]`
`386`	`386`	`},`
`387`	`387`	`{`
`388`		`- "description": "pinned connections are not returned after an network error during getMore",`
	`388`	`+ "description": "pinned connections are returned after an network error during getMore",`
`389`	`389`	`"operations": [`
`390`	`390`	`{`
`391`	`391`	`"name": "failPoint",`
`@@ -449,7 +449,7 @@`
`449`	`449`	`"object": "testRunner",`
`450`	`450`	`"arguments": {`
`451`	`451`	`"client": "client0",`
`452`		`- "connections": 1`
	`452`	`+ "connections": 0`
`453`	`453`	`}`
`454`	`454`	`},`
`455`	`455`	`{`
`@@ -677,7 +677,7 @@`
`677`	`677`	`]`
`678`	`678`	`},`
`679`	`679`	`{`
`680`		`- "description": "pinned connections are not returned to the pool after a non-network error on getMore",`
	`680`	`+ "description": "pinned connections are returned to the pool after a non-network error on getMore",`
`681`	`681`	`"operations": [`
`682`	`682`	`{`
`683`	`683`	`"name": "failPoint",`
`@@ -733,7 +733,7 @@`
`733`	`733`	`"object": "testRunner",`
`734`	`734`	`"arguments": {`
`735`	`735`	`"client": "client0",`
`736`		`- "connections": 1`
	`736`	`+ "connections": 0`
`737`	`737`	`}`
`738`	`738`	`},`
`739`	`739`	`{`
Original file line number	Diff line number	Diff line change
`@@ -372,9 +372,6 @@`
`372`	`372`	`{`
`373`	`373`	`"connectionCreatedEvent": {}`
`374`	`374`	`},`
`375`		`- {`
`376`		`- "poolClearedEvent": {}`
`377`		`- },`
`378`	`375`	`{`
`379`	`376`	`"connectionClosedEvent": {`
`380`	`377`	`"reason": "error"`
`@@ -384,6 +381,9 @@`
`384`	`381`	`"connectionCheckOutFailedEvent": {`
`385`	`382`	`"reason": "connectionError"`
`386`	`383`	`}`
	`384`	`+ },`
	`385`	`+ {`
	`386`	`+ "poolClearedEvent": {}`
`387`	`387`	`}`
`388`	`388`	`]`
`389`	`389`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@`
`197`	`197`	`}`
`198`	`198`	`},`
`199`	`199`	`{`
`200`		`- "level": "info",`
	`200`	`+ "level": "debug",`
`201`	`201`	`"component": "serverSelection",`
`202`	`202`	`"data": {`
`203`	`203`	`"message": "Waiting for suitable server to become available",`
`@@ -383,7 +383,7 @@`
`383`	`383`	`}`
`384`	`384`	`},`
`385`	`385`	`{`
`386`		`- "level": "info",`
	`386`	`+ "level": "debug",`
`387`	`387`	`"component": "serverSelection",`
`388`	`388`	`"data": {`
`389`	`389`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@`
`184`	`184`	`}`
`185`	`185`	`},`
`186`	`186`	`{`
`187`		`- "level": "info",`
	`187`	`+ "level": "debug",`
`188`	`188`	`"component": "serverSelection",`
`189`	`189`	`"data": {`
`190`	`190`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@`
`193`	`193`	`}`
`194`	`194`	`},`
`195`	`195`	`{`
`196`		`- "level": "info",`
	`196`	`+ "level": "debug",`
`197`	`197`	`"component": "serverSelection",`
`198`	`198`	`"data": {`
`199`	`199`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@`
`191`	`191`	`}`
`192`	`192`	`},`
`193`	`193`	`{`
`194`		`- "level": "info",`
	`194`	`+ "level": "debug",`
`195`	`195`	`"component": "serverSelection",`
`196`	`196`	`"data": {`
`197`	`197`	`"message": "Waiting for suitable server to become available",`