[object_store] Retry S3 requests with 200 response with "Error" in body #6508
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
tustvold
approved these changes
Oct 5, 2024
| use crate::RetryConfig; | ||
| use hyper::header::LOCATION; | ||
| use hyper::Response; | ||
| use reqwest::{Client, Method, StatusCode}; | ||
| use std::time::Duration; | ||
|
|
||
| #[test] |
There was a problem hiding this comment.
Big fan of the test coverage 👍
| @@ -33,6 +33,12 @@ pub enum Error { | |||
| #[snafu(display("Received redirect without LOCATION, this normally indicates an incorrectly configured region"))] | |||
| BareRedirect, | |||
|
|
|||
| #[snafu(display("Server error, body contains Error, with status {status}: {}", body.as_deref().unwrap_or("No Body")))] | |||
| Server { | |||
There was a problem hiding this comment.
I've confirmed this isn't public and therefore a breaking change
added 4 commits
October 6, 2024 23:28
PeterKeDer
force-pushed
the
peter/retry-200-error
branch
from
2cb16dc
to
c2d041f
Compare
|
@tustvold thanks for taking a look, I rebased & fixed lint. Should be good to go now :) |
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.
Which issue does this PR close?
Closes #5938
Rationale for this change
Some S3 requests like CopyObject and CompleteMultipartUpload may return a 200 response but have "InternalError" or "SlowDown" in the response body. These should be retried as if they were a 5xx error.
Relevant AWS documentation
e.g. we received this as a body of a 200 response
<?xml version=\"1.0\" encoding=\"UTF-8\"?><Error><Code>SlowDown</Code><Message>Please reduce your request rate.</Message><RequestId>123</RequestId><HostId>456</HostId></Error>What changes are included in this PR?
This PR adds the
retry_body_errorattribute forRequest/RetryableRequest, which isfalseby default. It is set to true for S3copyandcomplete_multipartrequests.If
retry_body_erroristrue, and if the body contains an error, we will retry it as if we got a 5xx resopnse.Unfortunately AWS doesn't seem to provide us with the exact format of the error message, so we can only look for
InternalErrororSlowDownin the response body and not much else.Are there any user-facing changes?
No