From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 652EC93E28 for ; Wed, 7 Feb 2024 15:29:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4613112031 for ; Wed, 7 Feb 2024 15:28:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 7 Feb 2024 15:28:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 14B5F44CC3 for ; Wed, 7 Feb 2024 15:28:28 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 7 Feb 2024 15:28:14 +0100 Message-ID: <20240207142824.2613933-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240207142824.2613933-1-c.heiss@proxmox.com> References: <20240207142824.2613933-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [runenv.pm] Subject: [pve-devel] [PATCH installer v2 3/3] proxinstall: expose arc size setting for zfs bootdisks for all products X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Feb 2024 14:29:00 -0000 For non-PVE products, simply use the ZFS defaults (aka. 50%) and leave unset, if the user never touches that setting. Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * add some more explanatory comments * shuffle around code to support placeholder-like value Proxmox/Install/RunEnv.pm | 3 ++- proxinstall | 37 +++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm index c393f67..2eb26f4 100644 --- a/Proxmox/Install/RunEnv.pm +++ b/Proxmox/Install/RunEnv.pm @@ -316,7 +316,8 @@ our $ZFS_ARC_SYSMEM_PERCENTAGE = 0.1; # use 10% of available system memory by de # Calculates the default upper limit for the ZFS ARC size. # Returns the default ZFS maximum ARC size in MiB. sub default_zfs_arc_max { - # Use ZFS default on non-PVE + # For products other the PVE, just let ZFS decide on its own. Setting `0` + # causes the installer to skip writing the `zfs_arc_max` module parameter. return 0 if Proxmox::Install::ISOEnv::get('product') ne 'pve'; my $default_mib = get('total_memory') * $ZFS_ARC_SYSMEM_PERCENTAGE; diff --git a/proxinstall b/proxinstall index 81dd368..ab89a08 100755 --- a/proxinstall +++ b/proxinstall @@ -1167,21 +1167,34 @@ my $create_raid_advanced_grid = sub { $spinbutton_copies->set_value($copies); push @$labeled_widgets, ['copies', $spinbutton_copies]; - if ($iso_env->{product} eq 'pve') { - my $total_memory = Proxmox::Install::RunEnv::get('total_memory'); - - my $spinbutton_arc_max = Gtk3::SpinButton->new_with_range( - $Proxmox::Install::RunEnv::ZFS_ARC_MIN_SIZE_MIB, $total_memory, 1); - $spinbutton_arc_max->set_tooltip_text('Maximum ARC size in megabytes'); - $spinbutton_arc_max->signal_connect('value-changed' => sub { - my $w = shift; - Proxmox::Install::Config::set_zfs_opt('arc_max', $w->get_value_as_int()); - }); - my $arc_max = Proxmox::Install::Config::get_zfs_opt('arc_max'); + my $total_memory = Proxmox::Install::RunEnv::get('total_memory'); + + my $spinbutton_arc_max = Gtk3::SpinButton->new_with_range( + $Proxmox::Install::RunEnv::ZFS_ARC_MIN_SIZE_MIB, $total_memory, 1); + $spinbutton_arc_max->set_tooltip_text('Maximum ARC size in megabytes'); + my $arc_max = Proxmox::Install::Config::get_zfs_opt('arc_max'); + + # GTKs SpinButton does not support a placeholder value, unfortunaly. That means we also + # have to set the value normally for non-PVE products, where the ZFS default should be used, + # in case the user does not explicitly set a value. + # But due to the signal-based nature of GTK, as long as the user never touches the spinbutton, + # `Proxmox::Install::Config::set_zfs_opt('arc_max', ..)` never gets called, thus the default + # value (which is 0 for non-PVE) won't get overwritten and no modprobe file is written. + if ($arc_max > 0) { $spinbutton_arc_max->set_value($arc_max); - push @$labeled_widgets, ['ARC max size', $spinbutton_arc_max, 'MiB']; + } else { + # .. but we need to display the "real" value to the user + $spinbutton_arc_max->set_value($total_memory * 0.5); } + # We need to connect the signal afterwards, to avoid triggering it using ->set_value() above. + $spinbutton_arc_max->signal_connect('value-changed' => sub { + my $w = shift; + Proxmox::Install::Config::set_zfs_opt('arc_max', $w->get_value_as_int()); + }); + + push @$labeled_widgets, ['ARC max size', $spinbutton_arc_max, 'MiB']; + push @$labeled_widgets, ['hdsize', $hdsize_btn, 'GB']; return $create_label_widget_grid->($labeled_widgets);; }; -- 2.43.0