ENT-14108: cf-execd.service: drain cf-agent on stop#6146
Open
larsewi wants to merge 1 commit into
Open
Conversation
`KillMode=process` only signals cf-execd. Any cf-agent spawned by cf-execd keeps running after systemctl stop returns. A mid-run agent can then re-trigger cf-php-fpm (`Wants=cf-postgres`), causing dependencies to be pulled back in after the stop was reported successful. This fix adds `ExecStopPost=` that waits up to 60s for cf-agent to drain, then `SIGKILL`s any survivor. It runs after cf-execd has exited, so no new agents are spawned during the drain. Ticket: ENT-14108 Changelog: cf-execd systemctl stop now waits for in-flight cf-agent to finish Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Contributor
Author
|
@cf-bottom Jenkins please :) |
larsewi
added
the
cherry-pick?
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/13857/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13857/ |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
KillMode=processonly signals cf-execd. Any cf-agent spawned by cf-execd keeps running after systemctl stop returns. A mid-run agent can then re-trigger cf-php-fpm (Wants=cf-postgres), causing dependencies to be pulled back in after the stop was reported successful.This fix adds
ExecStopPost=that waits up to 60s for cf-agent to drain, thenSIGKILLs any survivor. It runs after cf-execd has exited, so no new agents are spawned during the drain.Ticket: ENT-14108