-
-
Notifications
You must be signed in to change notification settings - Fork 753
Truncate large coro repr in retry log output #9197
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
Open
ernestprovo23
wants to merge
2
commits into
dask:main
Choose a base branch
from
ernestprovo23:fix-retry-excessive-logs
base: main
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.
+52
−1
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -229,6 +229,53 @@ async def f(): | |
| assert sleep_calls == [0.0, 1.0, 3.0, 6.0, 6.0] | ||
|
|
||
|
|
||
| def test_retry_truncates_large_coro_repr(cleanup): | ||
| """Test that retry truncates excessively large string representations of coro.""" | ||
|
|
||
| class MyEx(Exception): | ||
| pass | ||
|
|
||
| class LargeReprCallable: | ||
| def __repr__(self): | ||
| return "x" * 500 | ||
|
|
||
| async def __call__(self): | ||
| raise MyEx("fail") | ||
|
|
||
| log_messages = [] | ||
|
|
||
| async def f(): | ||
| return await retry( | ||
| LargeReprCallable(), | ||
| retry_on_exceptions=(MyEx,), | ||
| count=1, | ||
| delay_min=0, | ||
| delay_max=0, | ||
| jitter_fraction=0, | ||
| ) | ||
|
|
||
| import logging | ||
|
|
||
| handler = logging.Handler() | ||
| handler.emit = lambda record: log_messages.append(record.getMessage()) | ||
|
|
||
| logger = logging.getLogger("distributed.utils_comm") | ||
| logger.addHandler(handler) | ||
| try: | ||
| with pytest.raises(MyEx): | ||
| asyncio_run(f(), loop_factory=get_loop_factory()) | ||
| finally: | ||
| logger.removeHandler(handler) | ||
|
Comment on lines
+259
to
+268
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you just use |
||
|
|
||
| assert len(log_messages) == 1 | ||
| # reprlib truncates the 500-char repr to maxother (200) chars | ||
| assert len(log_messages[0]) < 500 | ||
| # reprlib uses "..." to indicate truncation | ||
| assert "..." in log_messages[0] | ||
| # Verify the full 500-char repr is NOT present | ||
| assert "x" * 500 not in log_messages[0] | ||
|
|
||
|
|
||
| def test_unpack_remotedata(): | ||
| def assert_eq(keys1: set[TaskRef], keys2: set[TaskRef]) -> None: | ||
| if len(keys1) != len(keys2): | ||
|
|
||
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 | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |||||||||
| import asyncio | ||||||||||
| import logging | ||||||||||
| import random | ||||||||||
| import reprlib | ||||||||||
| from collections import defaultdict | ||||||||||
| from collections.abc import Callable, Collection, Coroutine, Mapping | ||||||||||
| from functools import partial | ||||||||||
|
|
@@ -384,7 +385,10 @@ async def retry( | |||||||||
| try: | ||||||||||
| return await coro() | ||||||||||
| except retry_on_exceptions as ex: | ||||||||||
| operation = operation or str(coro) | ||||||||||
| if not operation: | ||||||||||
| aRepr = reprlib.Repr() | ||||||||||
| aRepr.maxother = 200 | ||||||||||
| operation = aRepr.repr(coro) | ||||||||||
|
Comment on lines
+389
to
+391
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's clean this up into a simple one-liner.
Suggested change
|
||||||||||
| logger.info( | ||||||||||
| f"Retrying {operation} after exception in attempt {i_try}/{count}: {ex}" | ||||||||||
| ) | ||||||||||
|
|
||||||||||
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.
Can you move imports to the top of the file. Claude loves importing stuff randomly in the middle of code for some reason.