Merge pull request #671 from KKoukiou/cockpit-storage-free-space

KKoukiou · web-flow · commit 1b1c5d27afb6 · 2025-03-06T08:48:32.000+01:00
storage:  some cockpit-storage page improvements for RAID detection
diff --git a/src/components/storage/CockpitStorageIntegration.jsx b/src/components/storage/CockpitStorageIntegration.jsx
@@ -370,6 +370,7 @@ const CheckStorageDialog = ({
 
     const useFreeSpace = useMemo(() => {
         const availability = checkUseFreeSpace({
+            allowReclaim: false,
             diskFreeSpace,
             diskTotalSpace,
             requiredSize,
@@ -379,8 +380,18 @@ const CheckStorageDialog = ({
         return availability.available && !availability.hidden;
     }, [diskFreeSpace, diskTotalSpace, requiredSize, selectedDisks]);
 
+    const mdArrays = useMemo(() => {
+        return Object.keys(devices).filter(device => devices[device].type.v === "mdarray");
+    }, [devices]);
+    const useEntireSoftwareDisk = useMemo(() => {
+        return selectedDisks.every(disk => (
+            mdArrays.includes(disk) &&
+            getDeviceChildren({ device: disk, deviceData: devices }).every(child => devices[child].type.v !== "partition")
+        ));
+    }, [devices, mdArrays, selectedDisks]);
+
     const loading = !error && checkStep !== undefined;
-    const storageRequirementsNotMet = !loading && (error || (!useConfiguredStorage && !useFreeSpace));
+    const storageRequirementsNotMet = !loading && (error || (!useConfiguredStorage && !useFreeSpace && !useEntireSoftwareDisk));
 
     useEffect(() => {
         const mode = useConfiguredStorage ? "use-configured-storage" : "use-free-space";
@@ -437,8 +448,6 @@ const CheckStorageDialog = ({
             return;
         }
 
-        const mdArrays = Object.keys(devices).filter(device => devices[device].type.v === "mdarray");
-
         // In blivet we recognize two "types" of MD array:
         // * The array is directly on top of disks: in this case we consider the array to be a disk
         // (similar to a hardware RAID) and create the partition table on the array
@@ -455,6 +464,11 @@ const CheckStorageDialog = ({
         // Check if we have mdarrays that are not fitting in the above two scenarios
         // and show an error message
         const mdArraysNotSupported = mdArrays.filter(device => {
+            // The user created a plain mdarray without any format to be used possible with 'Use entire disk'
+            if (devices[device].formatData.type.v === "") {
+                return false;
+            }
+
             if (
                 devices[device].parents.v.every(parent => devices[parent].type.v === "disk") &&
                 devices[device].formatData.type.v === "disklabel"
@@ -490,7 +504,7 @@ const CheckStorageDialog = ({
         } else {
             setCheckStep("prepare-partitioning");
         }
-    }, [checkStep, devices, usableDevices, selectedDisks]);
+    }, [checkStep, devices, mdArrays, usableDevices, selectedDisks]);
 
     useEffect(() => {
         // If the required devices needed for manual partitioning are set up,
@@ -638,7 +652,9 @@ const CheckStorageDialog = ({
                                         {useConfiguredStorageReview}
                                     </Stack>
                                 )
-                                : _("Free space requirements met")}
+                                : (
+                                    useEntireSoftwareDisk ? _("Use the RAID device for automatic partitioning") : _("Use free space")
+                                )}
                         </HelperTextItem>}
                     </HelperText>
                 </>}
diff --git a/src/components/storage/scenarios/UseFreeSpace.jsx b/src/components/storage/scenarios/UseFreeSpace.jsx
@@ -28,7 +28,7 @@ import { helpUseFreeSpace } from "../HelpAutopartOptions.jsx";
 
 const _ = cockpit.gettext;
 
-export const checkUseFreeSpace = ({ diskFreeSpace, diskTotalSpace, requiredSize, selectedDisks }) => {
+export const checkUseFreeSpace = ({ allowReclaim = true, diskFreeSpace, diskTotalSpace, requiredSize, selectedDisks }) => {
     const availability = new AvailabilityState();
 
     availability.hidden = false;
@@ -38,12 +38,16 @@ export const checkUseFreeSpace = ({ diskFreeSpace, diskTotalSpace, requiredSize,
         availability.hidden = diskFreeSpace === diskTotalSpace;
     }
     if (diskFreeSpace < requiredSize) {
-        availability.enforceAction = true;
         availability.reason = _("Not enough free space on the selected disks.");
         availability.hint = cockpit.format(
             _("To use this option, resize or remove existing partitions to free up at least $0."),
             cockpit.format_bytes(requiredSize)
         );
+        if (allowReclaim) {
+            availability.enforceAction = true;
+        } else {
+            availability.available = false;
+        }
     }
     return availability;
 };
diff --git a/test/check-storage-cockpit b/test/check-storage-cockpit
@@ -467,7 +467,6 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         b.switch_to_top()
         s.return_to_installation("Invalid RAID configuration detected.")
 
-
     @nondestructive
     @disk_images([("", 15), ("", 15), ("", 15)])
     def testRAIDonDisks(self):
@@ -510,15 +509,20 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         # Exit the cockpit-storage iframe and return to installation
         b.switch_to_top()
         s.return_to_installation()
-        s.return_to_installation()
+
+        with b.wait_timeout(60):
+            disk = "MDRAID-SOMERAID"
+            prefix="#cockpit-storage-integration-check-storage-dialog"
+            r.check_disk_row(disk, "/boot", "SOMERAID2, RAID", "1.07 GB", False, prefix=prefix)
+            r.check_disk_row(disk, "/", "SOMERAID3, RAID", "47.2 GB", False, prefix=prefix)
+
         s.return_to_installation_confirm()
 
         s.set_partitioning("use-configured-storage")
 
         i.reach(i.steps.REVIEW)
 
         def checkStorageReview(prefix=""):
-            disk = "MDRAID-SOMERAID"
             with b.wait_timeout(30):
                 r.check_disk(disk, "48.3 GB MDRAID-SOMERAID (MDRAID set (stripe))")
             r.check_disk_row(disk, "/boot", "SOMERAID2, RAID", "1.07 GB", False, prefix=prefix)
@@ -527,6 +531,49 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         # verify review screen
         checkStorageReview()
 
+    @nondestructive
+    @disk_images([("", 15), ("", 15), ("", 15)])
+    def testRAIDAutomatic(self):
+        b = self.browser
+        m = self.machine
+        i = Installer(b, m)
+        s = Storage(b, m)
+        r = Review(b, m)
+
+        self.addCleanup(m.execute, "mdadm --zero-superblock /dev/vda /dev/vdb /dev/vdc")
+        self.addCleanup(m.execute, "mdadm --stop /dev/md/SOMERAID")
+
+        i.open()
+        i.reach(i.steps.INSTALLATION_METHOD)
+        s.select_disks([("vdb", True), ("vda", True), ("vdc", True)])
+
+        s.modify_storage()
+        s.confirm_entering_cockpit_storage()
+        b.switch_to_frame("cockpit-storage")
+
+        # Create RAID device on vda, vdb, and vdc
+        self.click_dropdown(self.card_header("Storage"), "Create MDRAID device")
+        self.dialog_wait_open()
+        self.dialog_set_val("level", "raid0")
+        self.dialog_set_val("disks", {"vda": True, "vdb": True, "vdc": True})
+        self.dialog_set_val("name", "SOMERAID")
+        self.dialog_apply()
+        self.dialog_wait_close()
+
+        # Exit the cockpit-storage iframe and return to installation
+        b.switch_to_top()
+        s.return_to_installation()
+        s.return_to_installation_confirm()
+
+        s.check_partitioning_selected("erase-all")
+        i.reach(i.steps.REVIEW)
+
+        disk = "MDRAID-SOMERAID"
+        with b.wait_timeout(30):
+            r.check_disk(disk, "48.3 GB MDRAID-SOMERAID (MDRAID set (stripe))")
+        r.check_disk_row(disk, "/boot", "SOMERAID2, RAID", "1.07 GB", True, "xfs")
+        r.check_disk_row(disk, "/", "SOMERAID3, LVM", "16.1 GB", True, "xfs")
+
 
 if __name__ == '__main__':
     test_main()
diff --git a/test/check-storage-mountpoints-raid-e2e b/test/check-storage-mountpoints-raid-e2e
@@ -18,7 +18,7 @@
 from anacondalib import VirtInstallMachineCase, disk_images
 from installer import Installer
 from storage import Storage
-from testlib import test_main  # pylint: disable=import-error
+from testlib import test_main, timeout  # pylint: disable=import-error
 
 
 class TestStorageMountPointsRAID_E2E(VirtInstallMachineCase):
@@ -53,6 +53,7 @@ class TestStorageMountPointsRAID_E2E(VirtInstallMachineCase):
         """, timeout=90)
 
     @disk_images([("", 15), ("", 15)])
+    @timeout(900)
     def testLVMOnRAID(self):
         """
         Test RAID1 on partition level with LVM. Both disks (vda, vdb) have:
diff --git a/test/check-storage-reclaim-e2e b/test/check-storage-reclaim-e2e
@@ -20,12 +20,13 @@ from installer import Installer
 from operating_systems import DualBootHelper_E2E
 from review import Review
 from storage import Storage
-from testlib import test_main  # pylint: disable=import-error
+from testlib import test_main, timeout  # pylint: disable=import-error
 
 
 class TestStorageReclaim_E2E(DualBootHelper_E2E, VirtInstallMachineCase):
 
     @disk_images([("debian-stable", 20)])
+    @timeout(900)
     def testReclaimShrink(self):
         b = self.browser
         m = self.machine
diff --git a/test/helpers/storage.py b/test/helpers/storage.py
@@ -90,7 +90,7 @@ def return_to_installation(self, error=None):
     def return_to_installation_confirm(self):
         # FIXME: testBtrfsTopLevelVolume fails sometimes on CI without this workaround
         try:
-            with self.browser.wait_timeout(30):
+            with self.browser.wait_timeout(60):
                 self.browser.click("#cockpit-storage-integration-check-storage-dialog-continue")
                 self.browser.wait_not_present("#cockpit-storage-integration-check-storage-dialog")
         except Error:
