forked from aws/aws-sdk-cpp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1. Add new request headers for each attempt to retry: amz-sdk-invocation-id: <uuid> amz-sdk-request: ttl=<current time + request timeout + clock skew>; attempt=<current attempt number>; max=<max number of attempts> 2. Add a new retry strategy With the new StandardRetryStrategy, SDK is using retry quotas to limit the number of failed retries. Each request will acquire tokens from available retry quotas to retry, and release tokens if succeeds. If the service client is running out of quotas, SDK will not retry the requests. 3. Add a new date parser for ISO_8601_BASIC: %Y%m%dT%H%M%SZ
- Loading branch information
Showing
23 changed files
with
1,015 additions
and
89 deletions.
There are no files selected for viewing
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
134 changes: 134 additions & 0 deletions
134
aws-cpp-sdk-core-tests/aws/client/RetryStrategyTest.cpp
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Copyright 2010-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
|
|
||
| #include <aws/external/gtest.h> | ||
| #include <aws/core/client/AWSError.h> | ||
| #include <aws/core/client/CoreErrors.h> | ||
| #include <aws/core/client/RetryStrategy.h> | ||
| #include <aws/core/http/URI.h> | ||
| #include <aws/core/http/HttpClientFactory.h> | ||
| #include <aws/core/http/standard/StandardHttpRequest.h> | ||
| #include <aws/core/http/standard/StandardHttpResponse.h> | ||
| #include <aws/core/utils/stream/ResponseStream.h> | ||
| #include <aws/core/utils/Outcome.h> | ||
|
|
||
| using namespace Aws::Client; | ||
| using namespace Aws::Http; | ||
| using namespace Aws::Utils::Threading; | ||
|
|
||
| static const char ALLOCATION_TAG[] = "RetryStrategyTest"; | ||
|
|
||
| class MockStandardRetryStrategy : public Aws::Client::StandardRetryStrategy | ||
| { | ||
| public: | ||
| const std::shared_ptr<Aws::Client::RetryQuotaContainer>& GetRetryQuotaContainer() const | ||
| { | ||
| return m_retryQuotaContainer; | ||
| } | ||
| }; | ||
|
|
||
| TEST(RetryStrategyTest, TestDefaultRetryQuotaContainer) | ||
| { | ||
| AWSError<CoreErrors> requestTimeoutError(CoreErrors::REQUEST_TIMEOUT, true); | ||
| AWSError<CoreErrors> retryableError(CoreErrors::NETWORK_CONNECTION, true); | ||
|
|
||
| DefaultRetryQuotaContainer retryQuotaContainer; | ||
| ASSERT_EQ(500, retryQuotaContainer.GetRetryQuota()); | ||
| retryQuotaContainer.ReleaseRetryQuota(1); | ||
| ASSERT_EQ(500, retryQuotaContainer.GetRetryQuota()); | ||
|
|
||
| // Acquire 5 tokens, remains 495. | ||
| ASSERT_TRUE(retryQuotaContainer.AcquireRetryQuota(retryableError)); | ||
| ASSERT_EQ(495, retryQuotaContainer.GetRetryQuota()); | ||
|
|
||
| // Acquire 10 tokens, remains 485. | ||
| ASSERT_TRUE(retryQuotaContainer.AcquireRetryQuota(requestTimeoutError)); | ||
| ASSERT_EQ(485, retryQuotaContainer.GetRetryQuota()); | ||
|
|
||
| // Acquire 483 tokens, remains 2. | ||
| ASSERT_TRUE(retryQuotaContainer.AcquireRetryQuota(483)); | ||
| ASSERT_EQ(2, retryQuotaContainer.GetRetryQuota()); | ||
|
|
||
| // Not able to acquire more tokens. | ||
| ASSERT_FALSE(retryQuotaContainer.AcquireRetryQuota(retryableError)); | ||
| ASSERT_FALSE(retryQuotaContainer.AcquireRetryQuota(requestTimeoutError)); | ||
| ASSERT_FALSE(retryQuotaContainer.AcquireRetryQuota(3)); | ||
| } | ||
|
|
||
| TEST(RetryStrategyTest, TestStandardRetryStrategy) | ||
| { | ||
| AWSError<CoreErrors> requestTimeoutError(CoreErrors::REQUEST_TIMEOUT, true); | ||
| AWSError<CoreErrors> retryableError(CoreErrors::NETWORK_CONNECTION, true); | ||
| AWSError<CoreErrors> nonRetryableError(CoreErrors::INCOMPLETE_SIGNATURE, false); | ||
|
|
||
| MockStandardRetryStrategy retryStrategy; | ||
| ASSERT_EQ(500, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
| ASSERT_EQ(3, retryStrategy.GetMaxAttempts()); | ||
|
|
||
| std::shared_ptr<HttpRequest> httpRequest = CreateHttpRequest(URI("http://www.uri.com"), HttpMethod::HTTP_GET, Aws::Utils::Stream::DefaultResponseStreamFactoryMethod); | ||
| std::shared_ptr<HttpResponse> httpResponse = Aws::MakeShared<Standard::StandardHttpResponse>(ALLOCATION_TAG, httpRequest); | ||
| HttpResponseOutcome httpResponseOutcome(httpResponse); | ||
| retryStrategy.RequestBookkeeping(httpResponseOutcome); | ||
| ASSERT_EQ(500, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Non-retryable error. | ||
| ASSERT_FALSE(retryStrategy.ShouldRetry(nonRetryableError, 0)); | ||
| // Hit attempt limit. | ||
| ASSERT_FALSE(retryStrategy.ShouldRetry(retryableError, 2)); | ||
|
|
||
| // Acquire 5 tokens, remains 495. | ||
| ASSERT_TRUE(retryStrategy.ShouldRetry(retryableError, 0)); | ||
| ASSERT_EQ(495, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Acquire 10 tokens, remains 485. | ||
| ASSERT_TRUE(retryStrategy.ShouldRetry(requestTimeoutError, 0)); | ||
| ASSERT_EQ(485, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Acquire 478 tokens, remains 7. | ||
| ASSERT_TRUE(retryStrategy.GetRetryQuotaContainer()->AcquireRetryQuota(478)); | ||
| ASSERT_EQ(7, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Not able to retry with request timeout error with insufficient tokens. | ||
| ASSERT_FALSE(retryStrategy.ShouldRetry(requestTimeoutError, 0)); | ||
|
|
||
| // Still able to retry with other errors. Acquire 5 tokens, remains 2. | ||
| ASSERT_TRUE(retryStrategy.ShouldRetry(retryableError, 0)); | ||
| ASSERT_EQ(2, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Release 5 tokens, remains 7. | ||
| retryStrategy.RequestBookkeeping(httpResponseOutcome, retryableError); | ||
| ASSERT_EQ(7, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Release 10 tokens, remains 17. | ||
| retryStrategy.RequestBookkeeping(httpResponseOutcome, requestTimeoutError); | ||
| ASSERT_EQ(17, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Release 1 token, remains 18. | ||
| retryStrategy.RequestBookkeeping(httpResponseOutcome); | ||
| ASSERT_EQ(18, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Release 480 tokens, remains 498 | ||
| retryStrategy.GetRetryQuotaContainer()->ReleaseRetryQuota(480); | ||
| ASSERT_EQ(498, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Hit the max token capicity, remains 500. | ||
| retryStrategy.RequestBookkeeping(httpResponse, retryableError); | ||
| ASSERT_EQ(500, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
|
|
||
| // Hit the max token capicity, not able to release more tokens. | ||
| retryStrategy.RequestBookkeeping(httpResponse, requestTimeoutError); | ||
| ASSERT_EQ(500, retryStrategy.GetRetryQuotaContainer()->GetRetryQuota()); | ||
| } |
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
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
Oops, something went wrong.