daemon: Create RuntimePath if not equal to StateDir #15711
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
This change fixes an issue if StateDir is specified and is different from defaults.RuntimePath which is used to store pidfile in. When host is rebooted /var/run is clean. In case StateDir is set to something else than "/var/run/cilium" the daemon fails to create pidfile under "/var/run/cilium" path since that is not created: level=fatal msg="Failed to create Pidfile" error="open /var/run/cilium/cilium.pid: no such file or directory" file-path=/var/run/cilium/cilium.pid subsys=daemon Signed-off-by: Ondrej Blazek <ondra.blazkuj@gmail.com>
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
aanm
added
the
release-note/misc
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
|
test-me-please |
1 similar comment
|
test-me-please |
jibi
approved these changes
Apr 16, 2021
|
hit #15620, merging |
This was referenced Apr 28, 2021
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.
With this change, state-dir can be set to anything and code makes sure that
/var/run/ciliumis always present with correct rights since/var/runis clean after reboot.PidfilePath is set here https://github.com/cilium/cilium/blob/master/daemon/cmd/daemon_main.go#L1143
always set to
RuntimePath + "/cilium.pid". By defaultStateDiris set todefaults.RuntimePath==/var/run/ciliumbut when changed to something else,/var/run/ciliumwon't be created as in here:https://github.com/cilium/cilium/blob/master/daemon/cmd/daemon_main.go#L1119 because https://github.com/cilium/cilium/blob/master/pkg/option/config.go#L2449.