[Backport release-1.6] fix(linstor): add opt-in graceful satellite shutdown on Talos - #4401
Merged
Merged
Conversation
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: cozystack/cozystack/.coderabbit.yaml Review profile: CHILL Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
github-actions
Bot
added
area/release
myasnikovdaniil
force-pushed
the
manual-backport-4292-to-release-1.6
branch
2 times, most recently
from
September 25, 2026 04:32
375a1d5 to
a95fa36
Compare
Backport of #4292 to release-1.6. Cozystack's Talos configuration removes the systemd DRBD shutdown guard without a replacement. talos.gracefulShutdown.enabled, disabled by default, releases unused Secondary DRBD resources before the satellite stops so their backing devices, including ZFS zvols, can be released during normal shutdown. The hook skips Primary resources and open devices, rechecks each candidate, and stops on ambiguous status, command failure or timeout. It uses no force, demotion, Kubernetes API calls or extra permissions. Three differences from main, all from the same cause: release-1.6 has no drbd.enabled flag, since the DRBD-less-substrate switch landed after 1.6 was cut. The hook is therefore gated on talos.gracefulShutdown.enabled alone, the values block adds only that key, and the case asserting the hook is omitted on a substrate without DRBD is left out along with the flag it sets. The README line naming both flags names talos.enabled instead. Nothing else differs. The automated backport in #4320 stopped at the same values.yaml hunk and pushed the conflict markers as its only commit, which is why this exists. Verified on this branch: 11 Helm tests and the 20 behavioural Python tests pass. Assisted-by: LLM Signed-off-by: Yan Bondarenko <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
myasnikovdaniil
force-pushed
the
manual-backport-4292-to-release-1.6
branch
from
September 25, 2026 05:31
a95fa36 to
d159113
Compare
This was referenced Sep 25, 2026
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.
This reopens a fork backport from a branch in this repository so its CI can run. The commit is the one from #4338 by europrinter (@yankawai), unchanged. On release-1.6 the pull-request CI pushes the images it builds, and a run from a fork has no registry credentials, so #4338 stopped at the build jobs and never reached e2e. The description below is the author's.
What this PR does
Manual backport of #4292 to
release-1.6.The automated backport, #4320, stopped on a conflict in
packages/system/linstor/values.yamland pushed the markers as its only commit, so it is red on DCO and would ship conflict markers in a values file if merged.The conflict is
drbd.enabled, which does not exist on this line: the DRBD-less-substrate switch landed on main after 1.6 was cut, and the cherry-pick pulled its values block in with the hunk it needed. Everything else in the change applies unchanged, so three differences follow from that one cause:talos.gracefulShutdown.enabledalone rather than on it anddrbd.enabled;talos.gracefulShutdownonly;talos.enabled.Verified on this branch: 11 Helm tests and the 20 behavioural Python tests pass. The file set and line counts match #4292 apart from those three points.
Feature summary, unchanged from #4292: Cozystack's Talos configuration removes the systemd DRBD shutdown guard without a replacement.
talos.gracefulShutdown.enabled, disabled by default, releases unused Secondary DRBD resources before the satellite stops so their backing devices, including ZFS zvols, can be released during normal shutdown. The hook skips Primary resources and open devices, rechecks each candidate, and stops on ambiguous status, command failure or timeout. It never forces, demotes, calls the Kubernetes API or asks for extra permissions. It is opt-in because preStop also runs on ordinary satellite restarts, and Piraeus has one DaemonSet per node with no cluster-wide rollout barrier.Screenshots
Not a UI change.
Downstream repositories
Walked the trigger map against the diff: this touches one system chart, its hook script and its tests. No downstream repository restates the linstor chart values.
Release note