retry network errors when s3 library parse xml response #90216
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
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 |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |
| #include <aws/core/utils/logging/ErrorMacros.h> | ||
|
|
||
| #include <Poco/Net/NetException.h> | ||
| #include <Poco/Exception.h> | ||
|
|
||
| #include <IO/Expect404ResponseScope.h> | ||
| #include <IO/S3/Requests.h> | ||
|
|
@@ -501,37 +502,37 @@ Model::GetObjectTaggingOutcome Client::GetObjectTagging(GetObjectTaggingRequest | |
| Model::ListObjectsV2Outcome Client::ListObjectsV2(ListObjectsV2Request & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ true>( | ||
| request, [this](Model::ListObjectsV2Request & req) { return ListObjectsV2(req); }); | ||
| } | ||
|
|
||
| Model::ListObjectsOutcome Client::ListObjects(ListObjectsRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ true>( | ||
| request, [this](Model::ListObjectsRequest & req) { return ListObjects(req); }); | ||
| } | ||
|
|
||
| Model::GetObjectOutcome Client::GetObject(GetObjectRequest & request) const | ||
| { | ||
| return processRequestResult( | ||
| doRequest(request, [this](Model::GetObjectRequest & req) { return GetObject(req); })); | ||
| } | ||
|
|
||
| Model::AbortMultipartUploadOutcome Client::AbortMultipartUpload(AbortMultipartUploadRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::AbortMultipartUploadRequest & req) { return AbortMultipartUpload(req); }); | ||
| } | ||
|
|
||
| Model::CreateMultipartUploadOutcome Client::CreateMultipartUpload(CreateMultipartUploadRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::CreateMultipartUploadRequest & req) { return CreateMultipartUpload(req); }); | ||
| } | ||
|
|
||
| Model::CompleteMultipartUploadOutcome Client::CompleteMultipartUpload(CompleteMultipartUploadRequest & request) const | ||
| { | ||
| auto outcome = doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::CompleteMultipartUploadRequest & req) { return CompleteMultipartUpload(req); }); | ||
|
|
||
| const auto & key = request.GetKey(); | ||
| const auto & bucket = request.GetBucket(); | ||
|
|
@@ -578,42 +579,42 @@ Model::CompleteMultipartUploadOutcome Client::CompleteMultipartUpload(CompleteMu | |
| Model::CopyObjectOutcome Client::CopyObject(CopyObjectRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::CopyObjectRequest & req) { return CopyObject(req); }); | ||
| } | ||
|
|
||
| Model::PutObjectOutcome Client::PutObject(PutObjectRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::PutObjectRequest & req) { return PutObject(req); }); | ||
| } | ||
|
|
||
| Model::UploadPartOutcome Client::UploadPart(UploadPartRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::UploadPartRequest & req) { return UploadPart(req); }); | ||
| } | ||
|
|
||
| Model::UploadPartCopyOutcome Client::UploadPartCopy(UploadPartCopyRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::UploadPartCopyRequest & req) { return UploadPartCopy(req); }); | ||
| } | ||
|
|
||
| Model::DeleteObjectOutcome Client::DeleteObject(DeleteObjectRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::DeleteObjectRequest & req) { Expect404ResponseScope scope; return DeleteObject(req); }); | ||
| } | ||
|
|
||
| Model::DeleteObjectsOutcome Client::DeleteObjects(DeleteObjectsRequest & request) const | ||
| { | ||
| return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>( | ||
| request, [this](Model::DeleteObjectsRequest & req) { Expect404ResponseScope scope; return DeleteObjects(req); }); | ||
| } | ||
|
|
||
| Client::ComposeObjectOutcome Client::ComposeObject(ComposeObjectRequest & request) const | ||
| { | ||
| auto request_fn = [this](ComposeObjectRequest & req) | ||
| { | ||
| auto & endpoint_provider = const_cast<Client &>(*this).accessEndpointProvider(); | ||
| AWS_OPERATION_CHECK_PTR(endpoint_provider, ComposeObject, Aws::Client::CoreErrors, Aws::Client::CoreErrors::ENDPOINT_RESOLUTION_FAILURE); | ||
|
|
@@ -642,7 +643,7 @@ Client::ComposeObjectOutcome Client::ComposeObject(ComposeObjectRequest & reques | |
| } | ||
|
|
||
| template <typename RequestType, typename RequestFn> | ||
| std::invoke_result_t<RequestFn, RequestType &> | ||
| Client::doRequest(RequestType & request, RequestFn request_fn) const | ||
| { | ||
| addAdditionalAMZHeadersToCanonicalHeadersList(request, client_configuration.extra_headers); | ||
|
|
@@ -741,88 +742,100 @@ Client::doRequest(RequestType & request, RequestFn request_fn) const | |
| } | ||
|
|
||
| template <bool IsReadMethod, typename RequestType, typename RequestFn> | ||
| std::invoke_result_t<RequestFn, RequestType &> | ||
| Client::doRequestWithRetryNetworkErrors(RequestType & request, RequestFn request_fn) const | ||
| { | ||
| /// S3 does retries network errors actually. | ||
| /// But it does matter when errors occur. | ||
| /// This code retries a specific case when | ||
| /// network error happens when XML document is being read from the response body. | ||
| /// Hence, the response body is a stream, network errors are possible at reading. | ||
| /// S3 doesn't retry them. | ||
|
|
||
| /// Not all requests can be retried in that way. | ||
| /// Requests that read out response body to build the result are possible to retry. | ||
| /// Requests that expose the response stream as an answer are not retried with that code. E.g. GetObject. | ||
|
|
||
| addAdditionalAMZHeadersToCanonicalHeadersList(request, client_configuration.extra_headers); | ||
| auto with_retries = [this, request_fn_ = std::move(request_fn)] (RequestType & request_) | ||
| { | ||
| chassert(client_configuration.retryStrategy); | ||
| const Int64 max_attempts = client_configuration.retry_strategy.max_retries + 1; | ||
|
|
||
| Int64 attempt_no = 1; | ||
| std::invoke_result_t<RequestFn, RequestType &> outcome; | ||
|
|
||
| auto net_exception_handler = [&]() -> bool /// return true if we should retry | ||
| { | ||
| incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestsErrors, ProfileEvents::S3WriteRequestsErrors); | ||
| if (isClientForDisk()) | ||
| incrementProfileEvents<IsReadMethod>(ProfileEvents::DiskS3ReadRequestsErrors, ProfileEvents::DiskS3WriteRequestsErrors); | ||
|
|
||
| tryLogCurrentException(log, fmt::format("Network error on S3 request, attempt {} of {}", attempt_no, max_attempts)); | ||
|
|
||
| outcome = Aws::Client::AWSError<Aws::Client::CoreErrors>( | ||
| Aws::Client::CoreErrors::NETWORK_CONNECTION, | ||
| /*name*/ "", | ||
| /*message*/ fmt::format("All {} retry attempts failed. Last exception: {}", max_attempts, getCurrentExceptionMessage(false)), | ||
| /*retryable*/ true); | ||
|
Comment on lines
+776
to
+780
There was a problem hiding this comment. The
Member
Author
There was a problem hiding this comment. It acts as last error, if we run out of attempt we return the error stored in that variable, that is the last error. |
||
|
|
||
| // network exceptions are always retryable, we could just return true here | ||
| // but we have to check cancellation points for query, ShouldRetry method does it already | ||
| return client_configuration.retryStrategy->ShouldRetry(outcome.GetError(), /*attemptedRetries*/ -1); | ||
| }; | ||
|
|
||
| for (attempt_no = 1; attempt_no <= max_attempts; ++attempt_no) | ||
| { | ||
| incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestAttempts, ProfileEvents::S3WriteRequestAttempts); | ||
| if (isClientForDisk()) | ||
| incrementProfileEvents<IsReadMethod>(ProfileEvents::DiskS3ReadRequestAttempts, ProfileEvents::DiskS3WriteRequestAttempts); | ||
|
|
||
| if (attempt_no > 1) | ||
| { | ||
| incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestRetryableErrors, ProfileEvents::S3WriteRequestRetryableErrors); | ||
| if (isClientForDisk()) | ||
| incrementProfileEvents<IsReadMethod>(ProfileEvents::DiskS3ReadRequestRetryableErrors, ProfileEvents::DiskS3WriteRequestRetryableErrors); | ||
|
|
||
| // use previously attempt number to calculate delay | ||
| updateNextTimeToRetryAfterRetryableError(outcome.GetError(), attempt_no - 1); | ||
|
|
||
| // update ClickHouse-specific attempt number in the request | ||
| // to help choose the right timeouts on the HTTP client which depends on retry attempt number | ||
| auto clickhouse_request_attempt = getClickhouseAttemptNumber(request_); | ||
| setClickhouseAttemptNumber(request_, clickhouse_request_attempt + attempt_no); | ||
| } | ||
|
|
||
| /// Slowing down due to a previously encountered retryable error, possibly from another thread. | ||
| slowDownAfterRetryableError(); | ||
|
|
||
| try | ||
| { | ||
|
Member
Author
There was a problem hiding this comment. If seems like when |
||
| outcome = request_fn_(request_); | ||
|
|
||
| if (outcome.IsSuccess()) | ||
| break; | ||
|
|
||
| // do not increment S3ReadRequestsErrors/S3WriteRequestsErrors here, it has been accounted in IO/S3/PocoHTTPClient.cpp | ||
|
|
||
| /// Retry attempts are managed by the outer loop, so the attemptedRetries argument can be ignored. | ||
| if (!client_configuration.retryStrategy->ShouldRetry(outcome.GetError(), /*attemptedRetries*/ -1)) | ||
| break; | ||
| } | ||
| catch (Poco::Net::NetException &) | ||
| { | ||
| /// This includes "connection reset", "malformed message", and possibly other exceptions. | ||
| if (!net_exception_handler()) | ||
| break; | ||
| } | ||
| catch (Poco::TimeoutException &) | ||
| { | ||
| /// This includes "Timeout" | ||
| if (!net_exception_handler()) | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return outcome; | ||
| }; | ||
|
|
||
| return doRequest(request, with_retries); | ||
|
|
@@ -863,7 +876,7 @@ void Client::updateNextTimeToRetryAfterRetryableError(Aws::Client::AWSError<Aws: | |
| { | ||
| if (next_time_to_retry_after_retryable_error.compare_exchange_weak(stored_next_time, next_time_ms)) | ||
| { | ||
| LOG_TRACE(log, "Updated next retry time to {} ms forward after retryable error with code {}", sleep_ms, error.GetResponseCode()); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
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
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
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
Oops, something went wrong.
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.
I have made more changes in that function, just refactoring in a way that I like more.