ENT-11189: Raised cf-apache.service start timeout to avoid PID-file race - #6371
Merged
Merged
Conversation
The ENT-11189 fix only changed the masterfiles template, which is used only with mpf_enable_cfengine_systemd_component_management. Hubs use this unit by default. Ticket: ENT-11189 Changelog: Title Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
larsewi
added
the
cherry-pick?
Contributor
Author
|
@cf-bottom Jenkins please :) |
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/14719/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-14719/ |
craigcomstock
approved these changes
Sep 29, 2026
This was referenced Sep 29, 2026
larsewi
removed
the
cherry-pick?
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
3 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.
The earlier ENT-11189 fix only changed the masterfiles unit template. That template is used only with
mpf_enable_cfengine_systemd_component_management, so hubs still ran this unit with the default 90 s start timeout. This adds the sameTimeoutStartSec=300here, keeping the unit in sync with the template.Needs backport to 3.27.x and 3.24.x.
🤖 Generated with Claude Code