fix: preserve response body in retryError #2126
Open
Conversation
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
The retryError function was consuming the HTTP response body without restoring it for subsequent readers. This caused structured registry error messages to be lost during retries, falling back to generic HTTP status messages instead. This change buffers the response body and creates a new readable stream so that both retryError and subsequent error handling can access the response content. Before: - Without retry: MANIFEST_UNKNOWN: manifest unknown; unknown tag=v1.0.0 - With retry: unexpected status code 404 Not Found After: - Both cases: MANIFEST_UNKNOWN: manifest unknown; unknown tag=v1.0.0 Fixes google#2125
ryanbrainard
changed the title
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.
This is a fix for #2125. The
retryErrorfunction was consuming the HTTP response body without restoring it for subsequent readers. This caused structured registry error messages to be lost during retries, falling back to generic HTTP status messages instead. (See #2125 for a reproducer.)This change buffers the response body and creates a new readable stream so that both retryError and subsequent error handling can access the response content.
Before:
After:
Note,
remote.CheckError()appears to also have the same issue, but I did not fix that since that appears to be called as a terminal operation where the caller doesn't need to read the body again after getting an error.Fixes #2125