[pve-devel] [PATCH installer 1/2] tui: expose arc size setting for zfs bootdisks for all products

[Christoph Heiss]

For non-PVE products, this defaults to 50% of available system memory
(aka. ZFS default).

Signed-off-by: Christoph Heiss <c.heiss at proxmox.com>
---
 proxmox-installer-common/src/options.rs     | 45 ++++++++++++---------
 proxmox-tui-installer/src/views/bootdisk.rs | 19 ++++-----
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/proxmox-installer-common/src/options.rs b/proxmox-installer-common/src/options.rs
index afd12cd..87931d1 100644
--- a/proxmox-installer-common/src/options.rs
+++ b/proxmox-installer-common/src/options.rs
@@ -206,14 +206,15 @@ impl ZfsBootdiskOptions {
 /// # Returns
 /// The default ZFS maximum ARC size in MiB for this system.
 fn default_zfs_arc_max(product: ProxmoxProduct, total_memory: usize) -> usize {
-    if product != ProxmoxProduct::PVE {
-        // Use ZFS default for non-PVE
-        0
+    let mem_mib = if product == ProxmoxProduct::PVE {
+        // For PVE, use 10% as default and clamp to 16 GiB max
+        ((total_memory as f64) / 10.).round().min(16. * 1024.)
     } else {
-        ((total_memory as f64) / 10.)
-            .round()
-            .clamp(64., 16. * 1024.) as usize
-    }
+        // Use 50% default for non-PVE
+        ((total_memory as f64) / 2.).round()
+    };
+
+    mem_mib.max(64.) as usize
 }
 
 #[derive(Clone, Debug)]
@@ -417,23 +418,29 @@ mod tests {
 
     #[test]
     fn zfs_arc_limit() {
-        const TESTS: &[(usize, usize)] = &[
-            (16, 64), // at least 64 MiB
-            (1024, 102),
-            (4 * 1024, 410),
-            (8 * 1024, 819),
-            (150 * 1024, 15360),
-            (160 * 1024, 16384),
-            (1024 * 1024, 16384), // maximum of 16 GiB
+        const TESTS: &[(usize, (usize, usize, usize))] = &[
+            (16, (64, 64, 64)), // at least 64 MiB for all products
+            (1024, (102, 512, 512)),
+            (4 * 1024, (410, 2048, 2048)),
+            (8 * 1024, (819, 4096, 4096)),
+            (150 * 1024, (15360, 76800, 76800)),
+            (160 * 1024, (16384, 81920, 81920)),
+            (1024 * 1024, (16384, 524288, 524288)), // maximum of 16 GiB for PVE
         ];
 
-        for (total_memory, expected) in TESTS {
+        for (total_memory, (pve_expected, pbs_expected, pmg_expected)) in TESTS {
             assert_eq!(
                 default_zfs_arc_max(ProxmoxProduct::PVE, *total_memory),
-                *expected
+                *pve_expected
+            );
+            assert_eq!(
+                default_zfs_arc_max(ProxmoxProduct::PBS, *total_memory),
+                *pbs_expected
+            );
+            assert_eq!(
+                default_zfs_arc_max(ProxmoxProduct::PMG, *total_memory),
+                *pmg_expected
             );
-            assert_eq!(default_zfs_arc_max(ProxmoxProduct::PBS, *total_memory), 0);
-            assert_eq!(default_zfs_arc_max(ProxmoxProduct::PMG, *total_memory), 0);
         }
     }
 }
diff --git a/proxmox-tui-installer/src/views/bootdisk.rs b/proxmox-tui-installer/src/views/bootdisk.rs
index 7e13e91..7efe953 100644
--- a/proxmox-tui-installer/src/views/bootdisk.rs
+++ b/proxmox-tui-installer/src/views/bootdisk.rs
@@ -155,7 +155,7 @@ impl AdvancedBootdiskOptionsView {
                 &product_conf,
             )),
             AdvancedBootdiskOptions::Zfs(zfs) => {
-                view.add_child(ZfsBootdiskOptionsView::new(runinfo, zfs, &product_conf))
+                view.add_child(ZfsBootdiskOptionsView::new(runinfo, zfs))
             }
             AdvancedBootdiskOptions::Btrfs(btrfs) => {
                 view.add_child(BtrfsBootdiskOptionsView::new(&runinfo.disks, btrfs))
@@ -559,13 +559,7 @@ struct ZfsBootdiskOptionsView {
 
 impl ZfsBootdiskOptionsView {
     // TODO: Re-apply previous disk selection from `options` correctly
-    fn new(
-        runinfo: &RuntimeInfo,
-        options: &ZfsBootdiskOptions,
-        product_conf: &ProductConfig,
-    ) -> Self {
-        let is_pve = product_conf.product == ProxmoxProduct::PVE;
-
+    fn new(runinfo: &RuntimeInfo, options: &ZfsBootdiskOptions) -> Self {
         let inner = FormView::new()
             .child("ashift", IntegerEditView::new().content(options.ashift))
             .child(
@@ -592,9 +586,11 @@ impl ZfsBootdiskOptionsView {
                             .unwrap_or_default(),
                     ),
             )
-            .child("copies", IntegerEditView::new().content(options.copies).max_value(3))
-            .child_conditional(
-                is_pve,
+            .child(
+                "copies",
+                IntegerEditView::new().content(options.copies).max_value(3),
+            )
+            .child(
                 "ARC max size",
                 IntegerEditView::new_with_suffix("MiB")
                     .max_value(runinfo.total_memory)
@@ -614,7 +610,6 @@ impl ZfsBootdiskOptionsView {
         Self::new(
             runinfo,
             &ZfsBootdiskOptions::defaults_from(runinfo, product_conf),
-            product_conf,
         )
     }
 
-- 
2.42.0