unique_fs: detect unassembled RAID arrays in verify-unique-fs-label

Author: prestist

docs/release-notes.md

@@ -12,6 +12,7 @@ Major changes:
 Minor changes:
 
 - verify-unique-fs-label: Fix false failure on RAID1 mirrored boot setups
+- verify-unique-fs-label: Improve diagnostics for unassembled RAID arrays
 
 Internal changes:
 

src/bin/rdcore/unique_fs.rs

@@ -21,6 +21,18 @@ pub fn verify_unique_fs(config: VerifyUniqueFsLabelConfig) -> Result<()> {
     let pts = get_filesystems_with_label(&config.label, config.rereadpt)?;
     let count = pts.len();
     if count != 1 {
+        if count == 0 {
+            // rereadpt already done by get_filesystems_with_label above
+            let raid_members = get_raid_members_with_label(&config.label, false)?;
+            if !raid_members.is_empty() {
+                bail!(
+                    "No assembled filesystem labeled '{}', but found RAID member \
+                     devices {:?}. Is the RAID array degraded or failed to assemble?",
+                    config.label,
+                    raid_members
+                );
+            }
+        }
         bail!(
             "System has {} devices with a filesystem labeled '{}': {:?}",
             count,

src/blockdev.rs

@@ -882,6 +882,19 @@ pub fn get_filesystems_with_label(label: &str, rereadpt: bool) -> Result<Vec<Str
     Ok(result)
 }
 
+/// Returns RAID member devices with the given filesystem label.
+/// Used to produce better diagnostics when an expected filesystem is missing
+/// but RAID members carrying its label exist (e.g. array failed to assemble).
+pub fn get_raid_members_with_label(label: &str, rereadpt: bool) -> Result<Vec<String>> {
+    let result = get_all_filesystems(rereadpt)?
+        .iter()
+        .filter(|v| v.get("LABEL").map(|l| l.as_str()) == Some(label))
+        .filter(|v| v.get("USAGE").map(|u| u.as_str()) == Some("raid"))
+        .filter_map(|v| v.get("NAME").map(<_>::to_owned))
+        .collect();
+    Ok(result)
+}
+
 pub fn lsblk(dev: &Path, with_deps: bool) -> Result<Vec<HashMap<String, String>>> {
     let mut cmd = Command::new("lsblk");
     // Older lsblk, e.g. in CentOS 7.6, doesn't support PATH, but --paths option