Merge branch 'main' into token-bucket-optional

dariakp · web-flow · commit c0999ca592cb · 2026-03-09T11:11:53.000-04:00
diff --git a/drivers-evergreen-tools b/drivers-evergreen-tools
@@ -1 +1 @@
-Subproject commit f3720c0b98fb14a8b452670f7cda5ef8080e7eaf
+Subproject commit b26580ac7b03a7eb282053871da0a050c7075288
diff --git a/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.json b/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.json
@@ -85,7 +85,7 @@
       }
     },
     {
-      "description": "Mark server unknown on network timeout application error (beforeHandshakeCompletes)",
+      "description": "Ignore network timeout application error (beforeHandshakeCompletes)",
       "applicationErrors": [
         {
           "address": "a:27017",
@@ -118,4 +118,4 @@
       }
     }
   ]
-}
+}
diff --git a/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml b/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml
@@ -1,46 +1,48 @@
 description: Network timeouts before and after the handshake completes
 uri: mongodb://a/?replicaSet=rs
 phases:
-- description: Primary A is discovered
-  responses:
-  - - a:27017
-    - ok: 1
-      helloOk: true
-      isWritablePrimary: true
-      hosts:
-      - a:27017
+  - description: Primary A is discovered
+    responses:
+      - - a:27017
+        - ok: 1
+          helloOk: true
+          isWritablePrimary: true
+          hosts:
+            - a:27017
+          setName: rs
+          minWireVersion: 0
+          maxWireVersion: 9
+          topologyVersion: &topologyVersion_1_1
+            processId:
+              "$oid": '000000000000000000000001'
+            counter:
+              "$numberLong": '1'
+    outcome: &outcome
+      servers:
+        a:27017:
+          type: RSPrimary
+          setName: rs
+          topologyVersion: *topologyVersion_1_1
+          pool:
+            generation: 0
+      topologyType: ReplicaSetWithPrimary
+      logicalSessionTimeoutMinutes: null
       setName: rs
-      minWireVersion: 0
-      maxWireVersion: 9
-      topologyVersion: &topologyVersion_1_1
-        processId:
-          "$oid": '000000000000000000000001'
-        counter:
-          "$numberLong": '1'
-  outcome: &outcome
-    servers:
-      a:27017:
-        type: RSPrimary
-        setName: rs
-        topologyVersion: *topologyVersion_1_1
-        pool:
-          generation: 0
-    topologyType: ReplicaSetWithPrimary
-    logicalSessionTimeoutMinutes: null
-    setName: rs
 
-- description: Ignore network timeout application error (afterHandshakeCompletes)
-  applicationErrors:
-  - address: a:27017
-    when: afterHandshakeCompletes
-    maxWireVersion: 9
-    type: timeout
-  outcome: *outcome
+  - description: Ignore network timeout application error (afterHandshakeCompletes)
+    applicationErrors:
+      - address: a:27017
+        when: afterHandshakeCompletes
+        maxWireVersion: 9
+        type: timeout
+    outcome: *outcome
 
-- description: Mark server unknown on network timeout application error (beforeHandshakeCompletes)
-  applicationErrors:
-  - address: a:27017
-    when: beforeHandshakeCompletes
-    maxWireVersion: 9
-    type: timeout
-  outcome: *outcome
+  - description: Ignore network timeout application error (beforeHandshakeCompletes)
+    # The test runner may need to add the SystemOverloadedError label for the pre-handshake network timeout.
+    # The SystemOverloadedError label causes the error to be ignored.
+    applicationErrors:
+      - address: a:27017
+        when: beforeHandshakeCompletes
+        maxWireVersion: 9
+        type: timeout
+    outcome: *outcome
diff --git a/test/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_empty_tags.json b/test/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_empty_tags.json
@@ -0,0 +1,41 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSPrimary"
+      },
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      },
+      {}
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary"
+    }
+  ]
+}
diff --git a/test/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_empty_tags.yml b/test/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_empty_tags.yml
@@ -0,0 +1,26 @@
+# Attempt to select the secondary using an empty tag set. Expect empty tag set to match.
+# This is a regression test for RUST-2363.
+---
+topology_description:
+  type: ReplicaSetWithPrimary
+  servers:
+    - &1
+      address: a:27017
+      avg_rtt_ms: 5
+      type: RSPrimary
+      # No "tags".
+    - &2
+      address: b:27017
+      avg_rtt_ms: 5
+      type: RSSecondary
+      # No "tags"
+operation: read
+read_preference:
+  mode: SecondaryPreferred
+  tag_sets:
+    - data_center: nyc # Does not match.
+    - {} # Empty tag set.
+suitable_servers:
+  - *2
+in_latency_window:
+  - *2
diff --git a/test/spec/transactions/unified/backpressure-retryable-writes.json b/test/spec/transactions/unified/backpressure-retryable-writes.json
@@ -412,17 +412,31 @@
           "events": [
             {
               "commandStartedEvent": {
-                "commandName": "insert"
+                "command": {
+                  "startTransaction": true
+                },
+                "commandName": "insert",
+                "databaseName": "transaction-tests"
               }
             },
             {
               "commandStartedEvent": {
-                "commandName": "insert"
+                "command": {
+                  "startTransaction": true
+                },
+                "commandName": "insert",
+                "databaseName": "transaction-tests"
               }
             },
             {
               "commandStartedEvent": {
-                "commandName": "abortTransaction"
+                "command": {
+                  "startTransaction": {
+                    "$$exists": false
+                  }
+                },
+                "commandName": "abortTransaction",
+                "databaseName": "admin"
               }
             }
           ]
@@ -437,4 +451,4 @@
       ]
     }
   ]
-}
+}
diff --git a/test/spec/transactions/unified/backpressure-retryable-writes.yml b/test/spec/transactions/unified/backpressure-retryable-writes.yml
@@ -144,7 +144,7 @@ tests:
     outcome:
       - collectionName: *collection_name
         databaseName: *database_name
-        documents: 
+        documents:
           - { _id: 1 }
           - { _id: 2 }
   - description: writes are retried maxAttempts=5 times if backpressure labels are added
@@ -239,12 +239,22 @@ tests:
       - client: *client0
         events:
           - commandStartedEvent:
+              command:
+                startTransaction: true
               commandName: insert
+              databaseName: *database_name
           - commandStartedEvent:
+              command:
+                startTransaction: true
               commandName: insert
+              databaseName: *database_name
           - commandStartedEvent:
+              command:
+                startTransaction:
+                  $$exists: false
               commandName: abortTransaction
+              databaseName: admin
     outcome:
       - collectionName: *collection_name
         databaseName: *database_name
-        documents: []
+        documents: []

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`}`
`86`	`86`	`},`
`87`	`87`	`{`
`88`		`- "description": "Mark server unknown on network timeout application error (beforeHandshakeCompletes)",`
	`88`	`+ "description": "Ignore network timeout application error (beforeHandshakeCompletes)",`
`89`	`89`	`"applicationErrors": [`
`90`	`90`	`{`
`91`	`91`	`"address": "a:27017",`
`@@ -118,4 +118,4 @@`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`]`
`121`		`-}`
	`121`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -412,17 +412,31 @@`
`412`	`412`	`"events": [`
`413`	`413`	`{`
`414`	`414`	`"commandStartedEvent": {`
`415`		`- "commandName": "insert"`
	`415`	`+ "command": {`
	`416`	`+ "startTransaction": true`
	`417`	`+ },`
	`418`	`+ "commandName": "insert",`
	`419`	`+ "databaseName": "transaction-tests"`
`416`	`420`	`}`
`417`	`421`	`},`
`418`	`422`	`{`
`419`	`423`	`"commandStartedEvent": {`
`420`		`- "commandName": "insert"`
	`424`	`+ "command": {`
	`425`	`+ "startTransaction": true`
	`426`	`+ },`
	`427`	`+ "commandName": "insert",`
	`428`	`+ "databaseName": "transaction-tests"`
`421`	`429`	`}`
`422`	`430`	`},`
`423`	`431`	`{`
`424`	`432`	`"commandStartedEvent": {`
`425`		`- "commandName": "abortTransaction"`
	`433`	`+ "command": {`
	`434`	`+ "startTransaction": {`
	`435`	`+ "$$exists": false`
	`436`	`+ }`
	`437`	`+ },`
	`438`	`+ "commandName": "abortTransaction",`
	`439`	`+ "databaseName": "admin"`
`426`	`440`	`}`
`427`	`441`	`}`
`428`	`442`	`]`
`@@ -437,4 +451,4 @@`
`437`	`451`	`]`
`438`	`452`	`}`
`439`	`453`	`]`
`440`		`-}`
	`454`	`+}`