pluto: add more retries for requests out to AWS #3214
Merged
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
webern
approved these changes
Jun 20, 2023
The default timeout for the IMDS clients are set to 1 second. https://github.com/awslabs/smithy-rs/blob/7ed51b21290aba818fcfd7a5501fe7035cde5c24/aws/rust-runtime/aws-config/src/imds/client.rs#L47 |
stmcginnis
approved these changes
Jun 21, 2023
zmrow
approved these changes
Jun 21, 2023
bcressey
reviewed
Jun 21, 2023
sources/api/pluto/src/aws.rs
Outdated
|
|
||
| // Max request retry attempts | ||
| const MAX_ATTEMPTS: u32 = 10; | ||
| const IMDS_CONNECT_TIMEOUT: Duration = Duration::from_secs(2); |
There was a problem hiding this comment.
Can we make this 3 seconds to align with the AWS SDK?
sources/api/pluto/src/aws.rs
Outdated
Comment on lines
23
to
34
| pub(crate) async fn sdk_imds_client() -> Result<imds::Client> { | ||
| imds::Client::builder() | ||
| .max_attempts(MAX_ATTEMPTS) | ||
| .connect_timeout(IMDS_CONNECT_TIMEOUT) | ||
| .build() | ||
| .await | ||
| .context(SdkImdsSnafu) | ||
| } | ||
|
|
||
| pub(crate) fn sdk_retry_config() -> RetryConfig { | ||
| RetryConfigBuilder::new().max_attempts(MAX_ATTEMPTS).build() | ||
| } |
There was a problem hiding this comment.
Do these need to be pub(crate)?
Suggested change
| pub(crate) async fn sdk_imds_client() -> Result<imds::Client> { | |
| imds::Client::builder() | |
| .max_attempts(MAX_ATTEMPTS) | |
| .connect_timeout(IMDS_CONNECT_TIMEOUT) | |
| .build() | |
| .await | |
| .context(SdkImdsSnafu) | |
| } | |
| pub(crate) fn sdk_retry_config() -> RetryConfig { | |
| RetryConfigBuilder::new().max_attempts(MAX_ATTEMPTS).build() | |
| } | |
| async fn sdk_imds_client() -> Result<imds::Client> { | |
| imds::Client::builder() | |
| .max_attempts(MAX_ATTEMPTS) | |
| .connect_timeout(IMDS_CONNECT_TIMEOUT) | |
| .build() | |
| .await | |
| .context(SdkImdsSnafu) | |
| } | |
| fn sdk_retry_config() -> RetryConfig { | |
| RetryConfigBuilder::new().max_attempts(MAX_ATTEMPTS).build() | |
| } |
etungsten
force-pushed
the
retry-retry-retry
branch
from
5a49daf
to
37e6aa9
Compare
|
Pushes above and below addresses @bcressey 's comment.
|
Enforces a 6 minute timeout on settings generator execution so as to not hang the boot for too long before erroring out.
This adds more resiliency when pluto makes API requests out to EC2 and EKS. We choose a large number of retries to force the SDK to keep retrying until we timeout on the overall request. It's now less likely for the request to overall fail due to transient connection errors.
etungsten
force-pushed
the
retry-retry-retry
branch
from
37e6aa9
to
21876a0
Compare
stmcginnis
approved these changes
Jun 23, 2023
bcressey
approved these changes
Jun 23, 2023
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.
Issue number:
N/A
Description of changes:
Testing done:
On a host where 25% of all outbound packets get dropped, I was able to call
pluto private-dns-namewhere it retried the request 5 times (beyond the default 3 tries set by the SDK).Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.