tfgrid/zosstorage
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply mode: wire partition apply + mkfs; btrfs RAID1 flags and -f; UEFI detection and skip bios_boot when UEFI; sgdisk-based partition apply; update TODO and REGION markers

Browse Source
This commit is contained in:
Jan De Landtsheer
2025-09-29 15:10:57 +02:00
parent b0e41b59b1
commit 04216b7f8f
7 changed files with 295 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/fs/plan.rs
View File

@@ -18,20 +18,21 @@
// ext: dry-run mode to emit mkfs commands without executing (future).
// REGION: EXTENSION_POINTS-END
//
// REGION: SAFETY
// safety: must not run mkfs on non-empty or unexpected partitions; assume prior validation enforced.
// safety: ensure labels follow reserved semantics (ZOSBOOT for ESP, ZOSDATA for all data FS).
// REGION: SAFETY-END
// REGION: SAFETY
// safety: must not run mkfs on non-empty or unexpected partitions; assume prior validation enforced.
// safety: ensure labels follow reserved semantics (ZOSBOOT for ESP, ZOSDATA for all data FS).
// safety: mkfs.btrfs uses -f in apply path immediately after partitioning to handle leftover signatures.
// REGION: SAFETY-END
//
// REGION: ERROR_MAPPING
// errmap: external mkfs/blkid failures -> crate::Error::Tool with captured stderr.
// errmap: planning mismatches -> crate::Error::Filesystem with context.
// REGION: ERROR_MAPPING-END
//
// REGION: TODO
// todo: implement mapping of topology to FsSpec including bcachefs cache/backing composition.
// todo: implement mkfs invocation and UUID capture via util::run_cmd / util::run_cmd_capture.
// REGION: TODO-END
// REGION: TODO
// todo: bcachefs tuning flags mapping from config (compression/checksum/cache_mode) deferred
// todo: add UUID consistency checks across multi-device filesystems
// REGION: TODO-END
//! Filesystem planning and creation for zosstorage.
//!
//! Maps partition results to concrete filesystems (vfat, btrfs, bcachefs)
@@ -220,8 +221,25 @@ pub fn make_filesystems(plan: &FsPlan) -> Result<Vec<FsResult>> {
if spec.devices.is_empty() {
return Err(Error::Filesystem("btrfs requires at least one device".into()));
}
// mkfs.btrfs -L LABEL dev1 [dev2 ...]
// mkfs.btrfs -L LABEL [ -m raid1 -d raid1 (when multi-device/raid1) ] dev1 [dev2 ...]
let mut args: Vec<String> = vec![mkfs.clone(), "-L".into(), spec.label.clone()];
// If this Btrfs is multi-device (as planned in BtrfsRaid1 topology),
// set metadata/data profiles to raid1. This keeps plan/apply consistent.
if spec.devices.len() >= 2 {
args.push("-m".into());
args.push("raid1".into());
args.push("-d".into());
args.push("raid1".into());
}
// Note: compression is a mount-time option for btrfs; we will apply it in mount phase.
// Leaving mkfs-time compression unset by design.
// Force formatting in apply path to avoid leftover signatures on freshly created partitions.
// Safe because we just created these partitions in this run.
args.push("-f".into());
args.extend(spec.devices.iter().cloned());
let args_ref: Vec<&str> = args.iter().map(|s| s.as_str()).collect();
run_cmd(&args_ref)?;
@@ -244,6 +262,8 @@ pub fn make_filesystems(plan: &FsPlan) -> Result<Vec<FsResult>> {
return Err(Error::Filesystem("bcachefs requires at least two devices (cache + backing)".into()));
}
// bcachefs format --label LABEL dev_cache dev_backing ...
// TODO(fs): map compression/checksum/cache-mode flags from config in a follow-up.
// This is deferred per current scope to focus on btrfs RAID profile wiring.
let mut args: Vec<String> = vec![mkfs.clone(), "format".into(), "--label".into(), spec.label.clone()];
args.extend(spec.devices.iter().cloned());
let args_ref: Vec<&str> = args.iter().map(|s| s.as_str()).collect();