engine: save dockerID in createContainer #2609
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
Previously, the dockerID in the dockerContainer struct of a container is only saved in termination handler. This means that if the agent is forcefully stopped (e.g. via SIGKILL instead of SIGTERM), the dockerID is not saved, and as a result loses track of container if it is stopped by SIGKILL. This commit fixes the issue by saving the dockerID after creating the container.
fenxiong
force-pushed
the
boltdb-kill
branch
from
16e67ff
to
a9f7b63
Compare
angelcar
approved these changes
Sep 3, 2020
sparrc
approved these changes
Sep 3, 2020
yhlee-aws
approved these changes
Sep 3, 2020
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
Previously, the dockerID in the dockerContainer struct of a container is only saved in termination handler. This means that if the agent is forcefully killed (e.g. via SIGKILL instead of SIGTERM), the dockerID is not saved, and as a result it will lose track of container. This commit fixes the issue by saving the dockerID after creating the container.
Implementation details
In the engine package, save the dockerID of the container after creating it.
Testing
Unit test added. Manually verified the fix by running a task, kill agent container with docker kill and stop the task, and verify the container can be stopped (without the fix, the container will be left running).
Will add an e2e test separately for the SIGKILL scenario.
New tests cover the changes: yes
Description for the changelog
Bug - fixed a bug where the agent can lose track of containers if it's stopped by SIGKILL instead of SIGTERM.
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.