fix: check if retry is allowed after retry wait calculation #258
Conversation
This file contains 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
product-auto-label
bot
added
the
api: storage
google-cla
bot
added
the
cla: yes
tseaver
approved these changes
Aug 26, 2021
andrewsg
requested changes
Aug 28, 2021
There was a problem hiding this comment.
This looks good but I'm concerned at why there aren't more tests we have to change to reflect this. Do we not have any tests that test the case where retry strategy max_retries is used, instead of the timer-based settings? Do we need to add one, as a regression test?
|
|
||
| # Check if (another) retry is allowed. If retries are exhausted and | ||
| # no acceptable response was received, raise the retriable error. | ||
| if not retry_strategy.retry_allowed(total_sleep, num_retries): |
There was a problem hiding this comment.
The docstring for retry_strategy.retry_allowed() says that the num_retries is supposed to be the number of retries used so far. After thinking about it, I agree with your changes here and think that docstring is wrong. We should modify the docstring to reflect this change.
There was a problem hiding this comment.
@andrewsg I've updated the docstring and added another test case. PTAL, thanks!
…le-media-python into count-retry-allow
andrewsg
approved these changes
Aug 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
_helpers.wait_and_retry()handles many of the retry calls in the library and utilizesretry_allowed(). Given the logic inretry_allowed(), the check should happen after the num_retries and total_sleep incrementation.For example, if
RetryStrategy.max_retries = 0, the check should prevent any additional retry attempts. With the previous logic, 1 retry call would be made.If
RetryStrategy.max_cumulative_retry = 100, the check should prevent another retry that will cause the total sleep time to exceed 100. Moving the order of the retry_allowed check resolves this.Fixes #256