Add ECS_DOCKER_PULL_INACTIVITY_TIMEOUT - Address issue 1396 #1566
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
|
Thanks for the pull request! We will probably wait to merge this until after we are done migrating to the official docker sdk (work happening in the moby branch). |
|
@petderek It looks like no one has done any work in the moby branch in a month now. Any chance of merging this ahead of that being completed? |
|
@wattdave Yes, we hit some snags on the branch -- apologies for the delay. I'll merge this soon and we will get this released in v1.21.0. |
8 tasks
|
Thanks again... merged in #1607 |
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.
Summary
This pull request enables a new environment variable, ECS_DOCKER_PULL_INACTIVITY_TIMEOUT, in support of working around #1396.
Implementation details
I cloned the existing handling of other kinds of timeouts and applied them to this one, then applied the configured setting so that it was no longer hard-wired to 1 minute.
Testing
go test
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes:
yes
Description for the changelog
Add ECS_DOCKER_PULL_INACTIVITY_TIMEOUT environment variable
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.