PYTHON-5135 - Rename WriteConcernFailed code name to WriteConcernTimeout (mongodb#2214)

NoahStapp · web-flow · commit df30eff39014 · 2025-03-24T15:37:00.000-04:00
diff --git a/pymongo/asynchronous/client_session.py b/pymongo/asynchronous/client_session.py
@@ -458,10 +458,10 @@ def _max_time_expired_error(exc: PyMongoError) -> bool:
 
 
 # From the transactions spec, all the retryable writes errors plus
-# WriteConcernFailed.
+# WriteConcernTimeout.
 _UNKNOWN_COMMIT_ERROR_CODES: frozenset = _RETRYABLE_ERROR_CODES | frozenset(
     [
-        64,  # WriteConcernFailed
+        64,  # WriteConcernTimeout
         50,  # MaxTimeMSExpired
     ]
 )
diff --git a/pymongo/synchronous/client_session.py b/pymongo/synchronous/client_session.py
@@ -457,10 +457,10 @@ def _max_time_expired_error(exc: PyMongoError) -> bool:
 
 
 # From the transactions spec, all the retryable writes errors plus
-# WriteConcernFailed.
+# WriteConcernTimeout.
 _UNKNOWN_COMMIT_ERROR_CODES: frozenset = _RETRYABLE_ERROR_CODES | frozenset(
     [
-        64,  # WriteConcernFailed
+        64,  # WriteConcernTimeout
         50,  # MaxTimeMSExpired
     ]
 )
diff --git a/test/retryable_writes/unified/insertOne-serverErrors.json b/test/retryable_writes/unified/insertOne-serverErrors.json
@@ -739,7 +739,7 @@
       ]
     },
     {
-      "description": "InsertOne fails after WriteConcernError WriteConcernFailed",
+      "description": "InsertOne fails after WriteConcernError WriteConcernTimeout",
       "operations": [
         {
           "name": "failPoint",
@@ -757,7 +757,6 @@
                 ],
                 "writeConcernError": {
                   "code": 64,
-                  "codeName": "WriteConcernFailed",
                   "errmsg": "waiting for replication timed out",
                   "errInfo": {
                     "wtimeout": true
diff --git a/test/transactions-convenient-api/unified/commit-writeconcernerror.json b/test/transactions-convenient-api/unified/commit-writeconcernerror.json
@@ -56,7 +56,7 @@
   ],
   "tests": [
     {
-      "description": "commitTransaction is retried after WriteConcernFailed timeout error",
+      "description": "commitTransaction is retried after WriteConcernTimeout timeout error",
       "operations": [
         {
           "name": "failPoint",
@@ -74,7 +74,6 @@
                 ],
                 "writeConcernError": {
                   "code": 64,
-                  "codeName": "WriteConcernFailed",
                   "errmsg": "waiting for replication timed out",
                   "errInfo": {
                     "wtimeout": true
@@ -236,7 +235,7 @@
       ]
     },
     {
-      "description": "commitTransaction is retried after WriteConcernFailed non-timeout error",
+      "description": "commitTransaction is retried after WriteConcernTimeout non-timeout error",
       "operations": [
         {
           "name": "failPoint",
@@ -254,7 +253,6 @@
                 ],
                 "writeConcernError": {
                   "code": 64,
-                  "codeName": "WriteConcernFailed",
                   "errmsg": "multiple errors reported"
                 }
               }
diff --git a/test/transactions/unified/error-labels.json b/test/transactions/unified/error-labels.json
@@ -1176,7 +1176,7 @@
       ]
     },
     {
-      "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernFailed",
+      "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernTimeout",
       "operations": [
         {
           "object": "testRunner",
@@ -1338,7 +1338,7 @@
       ]
     },
     {
-      "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernFailed with wtimeout",
+      "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernTimeout with wtimeout",
       "operations": [
         {
           "object": "testRunner",
@@ -1356,7 +1356,6 @@
                 ],
                 "writeConcernError": {
                   "code": 64,
-                  "codeName": "WriteConcernFailed",
                   "errmsg": "waiting for replication timed out",
                   "errInfo": {
                     "wtimeout": true

Original file line number	Diff line number	Diff line change
`@@ -458,10 +458,10 @@ def _max_time_expired_error(exc: PyMongoError) -> bool:`
`458`	`458`
`459`	`459`
`460`	`460`	`# From the transactions spec, all the retryable writes errors plus`
`461`		`-# WriteConcernFailed.`
	`461`	`+# WriteConcernTimeout.`
`462`	`462`	`_UNKNOWN_COMMIT_ERROR_CODES: frozenset = _RETRYABLE_ERROR_CODES \| frozenset(`
`463`	`463`	`[`
`464`		`- 64, # WriteConcernFailed`
	`464`	`+ 64, # WriteConcernTimeout`
`465`	`465`	`50, # MaxTimeMSExpired`
`466`	`466`	`]`
`467`	`467`	`)`
Original file line number	Diff line number	Diff line change
`@@ -457,10 +457,10 @@ def _max_time_expired_error(exc: PyMongoError) -> bool:`
`457`	`457`
`458`	`458`
`459`	`459`	`# From the transactions spec, all the retryable writes errors plus`
`460`		`-# WriteConcernFailed.`
	`460`	`+# WriteConcernTimeout.`
`461`	`461`	`_UNKNOWN_COMMIT_ERROR_CODES: frozenset = _RETRYABLE_ERROR_CODES \| frozenset(`
`462`	`462`	`[`
`463`		`- 64, # WriteConcernFailed`
	`463`	`+ 64, # WriteConcernTimeout`
`464`	`464`	`50, # MaxTimeMSExpired`
`465`	`465`	`]`
`466`	`466`	`)`
Original file line number	Diff line number	Diff line change
`@@ -739,7 +739,7 @@`
`739`	`739`	`]`
`740`	`740`	`},`
`741`	`741`	`{`
`742`		`- "description": "InsertOne fails after WriteConcernError WriteConcernFailed",`
	`742`	`+ "description": "InsertOne fails after WriteConcernError WriteConcernTimeout",`
`743`	`743`	`"operations": [`
`744`	`744`	`{`
`745`	`745`	`"name": "failPoint",`
`@@ -757,7 +757,6 @@`
`757`	`757`	`],`
`758`	`758`	`"writeConcernError": {`
`759`	`759`	`"code": 64,`
`760`		`- "codeName": "WriteConcernFailed",`
`761`	`760`	`"errmsg": "waiting for replication timed out",`
`762`	`761`	`"errInfo": {`
`763`	`762`	`"wtimeout": true`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`],`
`57`	`57`	`"tests": [`
`58`	`58`	`{`
`59`		`- "description": "commitTransaction is retried after WriteConcernFailed timeout error",`
	`59`	`+ "description": "commitTransaction is retried after WriteConcernTimeout timeout error",`
`60`	`60`	`"operations": [`
`61`	`61`	`{`
`62`	`62`	`"name": "failPoint",`
`@@ -74,7 +74,6 @@`
`74`	`74`	`],`
`75`	`75`	`"writeConcernError": {`
`76`	`76`	`"code": 64,`
`77`		`- "codeName": "WriteConcernFailed",`
`78`	`77`	`"errmsg": "waiting for replication timed out",`
`79`	`78`	`"errInfo": {`
`80`	`79`	`"wtimeout": true`
`@@ -236,7 +235,7 @@`
`236`	`235`	`]`
`237`	`236`	`},`
`238`	`237`	`{`
`239`		`- "description": "commitTransaction is retried after WriteConcernFailed non-timeout error",`
	`238`	`+ "description": "commitTransaction is retried after WriteConcernTimeout non-timeout error",`
`240`	`239`	`"operations": [`
`241`	`240`	`{`
`242`	`241`	`"name": "failPoint",`
`@@ -254,7 +253,6 @@`
`254`	`253`	`],`
`255`	`254`	`"writeConcernError": {`
`256`	`255`	`"code": 64,`
`257`		`- "codeName": "WriteConcernFailed",`
`258`	`256`	`"errmsg": "multiple errors reported"`
`259`	`257`	`}`
`260`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1176,7 +1176,7 @@`
`1176`	`1176`	`]`
`1177`	`1177`	`},`
`1178`	`1178`	`{`
`1179`		`- "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernFailed",`
	`1179`	`+ "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernTimeout",`
`1180`	`1180`	`"operations": [`
`1181`	`1181`	`{`
`1182`	`1182`	`"object": "testRunner",`
`@@ -1338,7 +1338,7 @@`
`1338`	`1338`	`]`
`1339`	`1339`	`},`
`1340`	`1340`	`{`
`1341`		`- "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernFailed with wtimeout",`
	`1341`	`+ "description": "add UnknownTransactionCommitResult label to writeConcernError WriteConcernTimeout with wtimeout",`
`1342`	`1342`	`"operations": [`
`1343`	`1343`	`{`
`1344`	`1344`	`"object": "testRunner",`
`@@ -1356,7 +1356,6 @@`
`1356`	`1356`	`],`
`1357`	`1357`	`"writeConcernError": {`
`1358`	`1358`	`"code": 64,`
`1359`		`- "codeName": "WriteConcernFailed",`
`1360`	`1359`	`"errmsg": "waiting for replication timed out",`
`1361`	`1360`	`"errInfo": {`
`1362`	`1361`	`"wtimeout": true`