avoid pull behavior check for namespace pause image #1840
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
petderek
approved these changes
Feb 12, 2019
petderek
reviewed
Feb 12, 2019
agent/engine/docker_task_engine.go
Outdated
| @@ -670,6 +670,10 @@ func (engine *DockerTaskEngine) pullContainer(task *apitask.Task, container *api | |||
| case apicontainer.ContainerCNIPause: | |||
| // ContainerCNIPause image are managed at startup | |||
| return dockerapi.DockerContainerMetadata{} | |||
|
|
|||
| case apicontainer.ContainerNamespacePause: | |||
There was a problem hiding this comment.
Wait, can you put this on one line?
case api.ContainerCNIPause | api.ContainerNamespacePause:
There was a problem hiding this comment.
🤦 oops
use ',' not '|' .... '|' does entirely the wrong thing
yhlee-aws
approved these changes
Feb 12, 2019
sharanyad
force-pushed
the
pull-behavior-fix
branch
3 times, most recently
from
e316a08
to
f3051fe
Compare
|
functional tests are failing due to low memory limit |
sharanyad
force-pushed
the
pull-behavior-fix
branch
from
f3051fe
to
e32c222
Compare
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
#1837
when
ECS_IMAGE_PULL_BEHAVIORis set toonceand pause images are needed at the same time, agent will try to download pause image once and fail. this leads to the task failing.Implementation details
avoid pull behavior check for pause image used for container namespaces setup
Testing
New tests cover the changes:
Manual testing:
set
ECS_IMAGE_PULL_BEHAVIOR=onceand usepidMode:"task"in task definition.Task fails to run without this code change and passes otherwise.
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.