Skip to content

PYTHON-2984 Fix retry behavior for bulk write writeConcernError #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2021
Merged

PYTHON-2984 Fix retry behavior for bulk write writeConcernError #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04c19a8
PYTHON-2984 Resync retryable writes and transactions tests
ShaneHarvey Nov 18, 2021
5718067
PYTHON-2984 Fix retry behavior for bulk write writeConcernError
ShaneHarvey Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pymongo/bulk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
validate_is_document_type,
validate_ok_for_replace,
validate_ok_for_update)
from pymongo.helpers import _RETRYABLE_ERROR_CODES
from pymongo.helpers import _RETRYABLE_ERROR_CODES, _get_wce_doc
from pymongo.collation import validate_collation_or_none
from pymongo.errors import (BulkWriteError,
ConfigurationError,
Expand Down Expand Up @@ -119,9 +119,9 @@ def _merge_command(run, full_result, offset, result):
replacement["op"] = run.ops[idx]
full_result["writeErrors"].append(replacement)

wc_error = result.get("writeConcernError")
if wc_error:
full_result["writeConcernErrors"].append(wc_error)
wce = _get_wce_doc(result)
if wce:
full_result["writeConcernErrors"].append(wce)


def _raise_bulk_write_error(full_result):
Expand Down
21 changes: 15 additions & 6 deletions pymongo/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,18 @@ def _raise_write_concern_error(error):
error.get("errmsg"), error.get("code"), error)


def _get_wce_doc(result):
"""Return the writeConcernError or None."""
wce = result.get("writeConcernError")
if wce:
# The server reports errorLabels at the top level but it's more
# convenient to attach it to the writeConcernError doc itself.
error_labels = result.get("errorLabels")
if error_labels:
wce["errorLabels"] = error_labels
return wce


def _check_write_command_response(result):
"""Backward compatibility helper for write command error handling.
"""
Expand All @@ -196,12 +208,9 @@ def _check_write_command_response(result):
if write_errors:
_raise_last_write_error(write_errors)

error = result.get("writeConcernError")
if error:
error_labels = result.get("errorLabels")
if error_labels:
error.update({'errorLabels': error_labels})
_raise_write_concern_error(error)
wce = _get_wce_doc(result)
if wce:
_raise_write_concern_error(wce)


def _fields_list_to_dict(fields, option_name):
Expand Down
0 ...tryable_writes/bulkWrite-errorLabels.json → ..._writes/legacy/bulkWrite-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ryable_writes/bulkWrite-serverErrors.json → ...writes/legacy/bulkWrite-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/bulkWrite.json → test/retryable_writes/legacy/bulkWrite.json
View file
Open in desktop
File renamed without changes.
0 test/retryable_writes/deleteMany.json → test/retryable_writes/legacy/deleteMany.json
View file
Open in desktop
File renamed without changes.
0 ...tryable_writes/deleteOne-errorLabels.json → ..._writes/legacy/deleteOne-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ryable_writes/deleteOne-serverErrors.json → ...writes/legacy/deleteOne-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@
"failCommands": [
"delete"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/deleteOne.json → test/retryable_writes/legacy/deleteOne.json
View file
Open in desktop
File renamed without changes.
0 ..._writes/findOneAndDelete-errorLabels.json → .../legacy/findOneAndDelete-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...writes/findOneAndDelete-serverErrors.json → ...legacy/findOneAndDelete-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
"failCommands": [
"findAndModify"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/findOneAndDelete.json → ...yable_writes/legacy/findOneAndDelete.json
View file
Open in desktop
File renamed without changes.
0 ...writes/findOneAndReplace-errorLabels.json → ...legacy/findOneAndReplace-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...rites/findOneAndReplace-serverErrors.json → ...egacy/findOneAndReplace-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
"failCommands": [
"findAndModify"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/findOneAndReplace.json → ...able_writes/legacy/findOneAndReplace.json
View file
Open in desktop
File renamed without changes.
0 ..._writes/findOneAndUpdate-errorLabels.json → .../legacy/findOneAndUpdate-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...writes/findOneAndUpdate-serverErrors.json → ...legacy/findOneAndUpdate-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
"failCommands": [
"findAndModify"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/findOneAndUpdate.json → ...yable_writes/legacy/findOneAndUpdate.json
View file
Open in desktop
File renamed without changes.
0 ...ryable_writes/insertMany-errorLabels.json → ...writes/legacy/insertMany-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...yable_writes/insertMany-serverErrors.json → ...rites/legacy/insertMany-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/insertMany.json → test/retryable_writes/legacy/insertMany.json
View file
Open in desktop
File renamed without changes.
0 ...tryable_writes/insertOne-errorLabels.json → ..._writes/legacy/insertOne-errorLabels.json
View file
Open in desktop
File renamed without changes.
40 changes: 20 additions & 20 deletions ...ryable_writes/insertOne-serverErrors.json → ...writes/legacy/insertOne-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,12 +761,12 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 11600,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down Expand Up @@ -812,12 +812,12 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 11602,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down Expand Up @@ -863,12 +863,12 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 189,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down Expand Up @@ -914,12 +914,12 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down Expand Up @@ -965,12 +965,12 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/insertOne.json → test/retryable_writes/legacy/insertOne.json
View file
Open in desktop
File renamed without changes.
0 ...ryable_writes/replaceOne-errorLabels.json → ...writes/legacy/replaceOne-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...yable_writes/replaceOne-serverErrors.json → ...rites/legacy/replaceOne-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
"failCommands": [
"update"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/replaceOne.json → test/retryable_writes/legacy/replaceOne.json
View file
Open in desktop
File renamed without changes.
0 test/retryable_writes/updateMany.json → test/retryable_writes/legacy/updateMany.json
View file
Open in desktop
File renamed without changes.
0 ...tryable_writes/updateOne-errorLabels.json → ..._writes/legacy/updateOne-errorLabels.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ryable_writes/updateOne-serverErrors.json → ...writes/legacy/updateOne-serverErrors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
"failCommands": [
"update"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errmsg": "Replication is being shut down",
"errorLabels": [
"RetryableWriteError"
]
"errmsg": "Replication is being shut down"
}
}
},
Expand Down
0 test/retryable_writes/updateOne.json → test/retryable_writes/legacy/updateOne.json
View file
Open in desktop
File renamed without changes.
Loading