This repository was archived by the owner on Feb 24, 2020. It is now read-only.
stage1/gc: remove journal link #2289
Merged
Conversation
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
stage1/gc/gc.go
Outdated
| func removeJournalLink(uuid *types.UUID) error { | ||
| machineID := strings.Replace(uuid.String(), "-", "", -1) | ||
| journalLink := filepath.Join("/var/log/journal", machineID) | ||
| _, err := os.Lstat(journalLink) |
There was a problem hiding this comment.
os.Remove(), and if err == enoexist, err = nil
save a syscall, save a tree
In the nspawn flavors, we use the "--try-guest" option. This means a
symlink is created from `/var/log/journal/${machine-id}` to pod's
`/var/log/journal/{machine-id}` when the pod is started.
If that symlink exists when doing GC, remove it.
If systemd on the host is configured to use `/run/log/journal/`, we
don't care about that because it will be deleted on a reboot.
287ee91 to
0c098b9
Compare
|
Updated. |
|
LGTM |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
In the nspawn flavors, we use the "--try-guest" option. This means a
symlink is created from
/var/log/journal/${machine-id}to pod's/var/log/journal/{machine-id}when the pod is started.If that symlink exists when doing GC, remove it.
If systemd on the host is configured to use
/run/log/journal/, wedon't care about that because it will be deleted on a reboot.
Fixes #2281