rework handling of local storage #247
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 also simplifies the packaging by relying on more features of tmpfiles. Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
jamieand
reviewed
Sep 18, 2019
| let unix_epoch = FileTime::zero(); | ||
|
|
||
| // Set the file modification times for /etc, /var, /opt to the unix epoch time to ensure that | ||
| // Set the file modification times for /etc to the unix epoch time to ensure that | ||
| // systemd detect these directories as 'outdated/uninitialized' and perform all the initialization |
There was a problem hiding this comment.
"detects this directory as ... and performs"
jamieand
approved these changes
Sep 18, 2019
iliana
reviewed
Sep 18, 2019
|
|
||
| case SD_PATH_SYSTEM_STATE_LOGS: | ||
| - *ret = "/var/log"; | ||
| + *ret = "/run/log"; |
There was a problem hiding this comment.
Does this mean we lose the journal on reboot? This is probably not ideal.
There was a problem hiding this comment.
It's not ideal but it's also not new behavior.
We'd also need to persist the machine ID for a durable journal to be helpful.
There was a problem hiding this comment.
#250 for persistent journal
| @@ -1,7 +1,7 @@ | |||
| {{#each settings.ntp.time-servers}} | |||
| pool {{this}} iburst | |||
| {{/each}} | |||
| driftfile /var/lib/thar/chrony/drift | |||
| driftfile /run/lib/chrony/drift | |||
There was a problem hiding this comment.
The drift file shouldn't be ephemeral, especially if we are often rebooting to apply updates.
There was a problem hiding this comment.
This and also the lack of persistence for DHCP leases is a concern.
We need to make sure both wicked and chrony are hardened against corrupted input before we allow them to read from persistent storage.
There was a problem hiding this comment.
If we want to merge this as-is, I'll ask for an issue tracking persistence of the drift file and DHCP leases.
bin/rpm2img
Outdated
| # boot: 20M + root: 900M + hash: 8M + reserved: 95M = 1023M | ||
| # boot partition attributes (-A): 48 = gptprio priority bit; 56 = gptprio successful bit | ||
| # partitions are backwards so that we don't make things inconsistent when specifying a wrong end sector :) | ||
| sgdisk --clear \ | ||
| -n 0:2048M:4095M -c 0:"THAR-DATA" -t 0:8300 \ | ||
| -n 0:1953M:0 -c 0:"THAR-RESERVED-B" -t 0:"${THAR_RESERVED_TYPECODE}" \ |
There was a problem hiding this comment.
Suggested change
| -n 0:1953M:0 -c 0:"THAR-RESERVED-B" -t 0:"${THAR_RESERVED_TYPECODE}" \ | |
| -n 0:1953M:2047M -c 0:"THAR-RESERVED-B" -t 0:"${THAR_RESERVED_TYPECODE}" \ |
Signed-off-by: Ben Cressey <[email protected]>
This moves the THAR-DATA mount from /var/lib/thar to /local, where we create the directories necessary to mount /var and /opt from that volume. Since the directories are persistent, we no longer need to create the correspoindg tmpfs or overlayfs mounts during preinit. Both mounts are now wanted by the local-fs.target, so most units do not need to declare an explicit dependency. Signed-off-by: Ben Cressey <[email protected]>
This replaces the previous overlayfs method, and still allows for containers launched by the orchestrator agent to add or replace plugins. Signed-off-by: Ben Cressey <[email protected]>
Although these services ship as part of the OS, we want to enable customers to replace the persistent storage volume with their own copy, for example to supply a cache of downloaded container images. Paths such as `/var/lib/docker` make it easier for these volumes to be created without baking in a lot of OS specific details. Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
bcressey
force-pushed
the
local-storage
branch
from
ae80d1b to
88dc591
Compare
iliana
approved these changes
Sep 18, 2019
3 tasks
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.
Issue #, if available:
#167
Description of changes:
We now reserve
/varand/optas persistent storage for customer use./var/lib/tharcontinues to hold persistent files for the OS, but other users of/varhave been relocated to/run.Testing done
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.