[release-4.16] OCPBUGS-36198: daemon/update: disable systemd unit before overwriting #4436
Conversation
When overwriting a systemd unit with new content, we need to account for the case where the new unit content has a different `[Install]` section. If it does, then simply overwriting will leak the previous enablement symlinks and become node state. That's OK most of the time, but this can cause real issues as we've seen with the combination of openshift#3967 which does exactly that (changing `[Install]` sections) and openshift#4213 which assumed that those symlinks were cleaned up. More details on that cocktail in: https://issues.redhat.com/browse/OCPBUGS-33694?focusedId=24917003#comment-24917003 Fix this by always checking if the unit is currently enabled, and if so, running `systemctl disable` *before* overwriting its contents. The unit will then be re-enabled (or not) based on the MachineConfig. Fixes: https://issues.redhat.com/browse/OCPBUGS-33694
Due to the bug detailed in the previous commit, we now have nodes out there that have stale enablement symlinks on-disk. It would be too risky to try to catch them all and clean them up, but at least let's clean up the ones that are known to be problematic.
|
@openshift-cherrypick-robot: Jira Issue OCPBUGS-33694 has been cloned as Jira Issue OCPBUGS-36198. Will retitle bug to link to clone. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci
bot
changed the title
openshift-ci-robot
added
the
jira/valid-reference
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-36198, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci-robot
added
the
jira/invalid-bug
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@jlebon: This pull request references Jira Issue OCPBUGS-36198, which is valid. The bug has been moved to the POST state. 7 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
/label staff-eng-approved |
openshift-ci
bot
added
the
staff-eng-approved
This comment was marked as off-topic.
This comment was marked as off-topic.
openshift-ci
bot
added
the
backport-risk-assessed
openshift-ci
bot
assigned anuragthehatter, eurijon, mburman5, mhanss, ptalgulk01, rbbratta, reihl, rioliu-rh and rlobillo
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: djoshy, jbtrystram, openshift-cherrypick-robot, yuqi-zhang The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/label cherry-pick-approved |
openshift-ci
bot
added
the
cherry-pick-approved
|
/retest |
|
@openshift-cherrypick-robot: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
openshift-merge-bot
bot
merged commit 031dda5
into
openshift:release-4.16
|
@openshift-cherrypick-robot: Jira Issue OCPBUGS-36198: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-36198 has been moved to the MODIFIED state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build ose-machine-config-operator-container-v4.16.0-202406270416.p0.g031dda5.assembly.stream.el9 for distgit ose-machine-config-operator. |
|
/cherry-pick release-4.15 |
|
@jbtrystram: new pull request created: #4441 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
Fix included in accepted release 4.16.0-0.nightly-2024-06-27-091410 |
This is an automated cherry-pick of #4421
/assign jbtrystram