forked from apache/cassandra-python-driver
-
Notifications
You must be signed in to change notification settings - Fork 49
Fix driver behavior on TruncateError handling - stop retrying on permanent failures #632
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.
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
Draft
Copilot
wants to merge
5
commits into
master
Choose a base branch
from
copilot/fix-truncate-error-retry-logic
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+89
−5
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8aece64
Initial plan
Copilot 2ed6106
Fix TruncateError retry behavior - stop retrying on truncate errors
Copilot ddb1e91
Add unit tests for TruncateError message handling
Copilot 9222b2e
Address code review feedback - simplify to_exception call and clarify…
Copilot 77d5c57
Refactor TruncateError handling for better readability
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| # Copyright DataStax, Inc. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import unittest | ||
| from cassandra.protocol import TruncateError | ||
|
|
||
|
|
||
| class TruncateErrorTest(unittest.TestCase): | ||
| """ | ||
| Test TruncateError exception behavior | ||
| """ | ||
|
|
||
| def test_truncate_error_message_includes_server_message(self): | ||
| """ | ||
| Verify that TruncateError includes the server-provided error message | ||
| in addition to the generic summary. | ||
|
|
||
| This addresses the issue where the error message was thought to be ignored. | ||
| The server message should always be included in the error string representation. | ||
| """ | ||
| server_message = "unconfigured table test_table" | ||
| error = TruncateError(code=0x1003, message=server_message, info=None) | ||
| error_str = str(error) | ||
|
|
||
| # Verify both the summary and server message are in the error string | ||
| self.assertIn("Error during truncate", error_str, | ||
| "Generic summary should be in error string") | ||
| self.assertIn(server_message, error_str, | ||
| "Server-provided message should be in error string") | ||
|
|
||
| def test_truncate_error_code(self): | ||
| """ | ||
| Verify that TruncateError has the correct error code (0x1003) | ||
| """ | ||
| error = TruncateError(code=0x1003, message="test", info=None) | ||
| self.assertEqual(error.code, 0x1003) | ||
| self.assertEqual(error.error_code, 0x1003) | ||
|
|
||
| def test_truncate_error_summary(self): | ||
| """ | ||
| Verify that TruncateError has the correct summary message | ||
| """ | ||
| error = TruncateError(code=0x1003, message="test", info=None) | ||
| self.assertEqual(error.summary, "Error during truncate") | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| unittest.main() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot - the code could have been more readable if you kept the TruncateError in line 4479, and here just did and
if isntance(response, TruncateError):and then lines 4792-4793. Please fix.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Refactored for better readability in commit 77d5c57. TruncateError is now kept in the error tuple on line 4779, with a specific check inside the block to handle it differently (no retry). This reduces duplication and makes the code flow clearer.