fix(storage/chunk/client/aws): have GetObject check for canceled context #14420
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
S3ObjectClient.GetObject incorrectly returned nil, 0, nil when the provided context is already canceled.
rfratto
commented
Oct 8, 2024
| @@ -393,7 +393,7 @@ func (a *S3ObjectClient) GetObject(ctx context.Context, objectKey string) (io.Re | |||
| // Map the key into a bucket | |||
| bucket := a.bucketFromKey(objectKey) | |||
|
|
|||
| var lastErr error | |||
| lastErr := ctx.Err() | |||
There was a problem hiding this comment.
This is what the IBMCloud client does too, though I'm worried there's still an edge case where the context gets canceled in between this line and the first call to retries.Ongoing(). It sounds pretty unlikely so I didn't handle that here.
chaudum
approved these changes
Oct 8, 2024
rfratto
added
type/bug
|
This PR must be merged before a backport PR will be created. |
3 similar comments
|
This PR must be merged before a backport PR will be created. |
|
This PR must be merged before a backport PR will be created. |
|
This PR must be merged before a backport PR will be created. |
6 tasks
trevorwhitney
pushed a commit
that referenced
this pull request
Oct 10, 2024
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.
What this PR does / why we need it:
S3ObjectClient.GetObject incorrectly returned nil, 0, nil when the provided context is already canceled.
Which issue(s) this PR fixes:
N/A
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR