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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D55AC9D033 for ; Wed, 25 Oct 2023 10:17:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B82FB116AA for ; Wed, 25 Oct 2023 10:17:11 +0200 (CEST) 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, 25 Oct 2023 10:17:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F3F7345CA9 for ; Wed, 25 Oct 2023 10:17:09 +0200 (CEST) Date: Wed, 25 Oct 2023 10:17:08 +0200 From: Christoph Heiss To: Thomas Lamprecht Cc: Proxmox VE development discussion Message-ID: References: <20231024115530.1101733-1-c.heiss@proxmox.com> <20231024115530.1101733-2-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 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 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, config.pm, install.pm, github.io, proxmox.com] Subject: Re: [pve-devel] [PATCH installer v2 1/6] fix #4829: install: add new ZFS `arc_max` setup option 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, 25 Oct 2023 08:17:11 -0000 Thanks for the review! I will refactor all the points mentioned and send a v2 soon. On Tue, Oct 24, 2023 at 05:05:15PM +0200, Thomas Lamprecht wrote: > > Am 24/10/2023 um 13:55 schrieb Christoph Heiss: > > Signed-off-by: Christoph Heiss > > --- > > Changes v1 -> v2: > > * No changes > > > > Proxmox/Install.pm | 4 ++++ > > Proxmox/Install/Config.pm | 1 + > > Proxmox/Install/RunEnv.pm | 38 ++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 43 insertions(+) > > > > diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm > > index 1117fc4..0c3541f 100644 > > --- a/Proxmox/Install.pm > > +++ b/Proxmox/Install.pm > > @@ -1141,6 +1141,10 @@ _EOD > > > > file_write_all("$targetdir/etc/kernel/cmdline", "root=ZFS=$zfs_pool_name/ROOT/$zfs_root_volume_name boot=zfs\n"); > > > > + my $arc_max = Proxmox::Install::RunEnv::clamp_zfs_arc_max( > > + Proxmox::Install::Config::get_zfs_opt('arc_max')) * 1024 * 1024; > > Mixing multiplication and method call this way is a bit hard to read. > > Maybe move the clamping into out to its own local method, something like: > > my sub setup_zfs_conf { > my ($target_dir) = @_; > > my $arc_max_mb = Proxmox::Install::Config::get_zfs_opt('arc_max'); > my $arc_max = Proxmox::Install::RunEnv::clamp_zfs_arc_max($arc_max_mb) * 1024 * 1024; > > if ($arc_max > 0) { > file_write_all("${target_dir}/etc/modprobe.d/zfs.conf", "options zfs zfs_arc_max=$arc_max\n"); > } > } Seems like a good idea, the extract_data() sub is _way_ to overloaded already anyway. > > > + file_write_all("$targetdir/etc/modprobe.d/zfs.conf", "options zfs zfs_arc_max=$arc_max\n") > > + if $arc_max > 0; > > > > } > > > > diversion_remove($targetdir, "/usr/sbin/update-grub"); > > diff --git a/Proxmox/Install/Config.pm b/Proxmox/Install/Config.pm > > index 024f62a..f12ae67 100644 > > --- a/Proxmox/Install/Config.pm > > +++ b/Proxmox/Install/Config.pm > > @@ -72,6 +72,7 @@ my sub init_cfg { > > compress => 'on', > > checksum => 'on', > > copies => 1, > > + arc_max => Proxmox::Install::RunEnv::default_zfs_arc_max(), > > }, > > # TODO: single disk selection config > > target_hd => undef, > > diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm > > index c9d788b..9236030 100644 > > --- a/Proxmox/Install/RunEnv.pm > > +++ b/Proxmox/Install/RunEnv.pm > > @@ -301,6 +301,44 @@ sub query_installation_environment : prototype() { > > return $output; > > } > > > > +our $ZFS_ARC_MIN_SIZE = 64; # MiB > > + > > +# Calculates the default upper limit for the ZFS ARC size. > > +# See also https://bugzilla.proxmox.com/show_bug.cgi?id=4829 and > > +# https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Module%20Parameters.html#zfs-arc-max > > +sub default_zfs_arc_max { > > + # Use ZFS default on non-PVE > > + return 0 if Proxmox::Install::ISOEnv::get('product') ne 'pve'; > > + > > + my $max = 16 * 1024; # 16 GiB > > + > > + my $rounded = int(sprintf('%.0f', get('total_memory') / 10)); > > knowing in what units this is calculating/returning would be great here > (via comment and/or variable name) Definitely sensible, I will rename + expand the comments a bit more. > > > + if ($rounded > $max) { > > + return $max; > > + } elsif ($rounded < $ZFS_ARC_MIN_SIZE) { > > + return $ZFS_ARC_MIN_SIZE; > > + } > > + > > + return $rounded; > > +} > > + > > +# Clamps the provided ZFS arc_max value to the accepted bounds. See also > > +# https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Module%20Parameters.html#zfs-arc-max > > +sub clamp_zfs_arc_max { > > + my ($value) = @_; > > please at least comment, or better, name variables accordingly, in what > units your dealing here, I think MB? > > When I worked on the partition sizing code it was a PITA to trace what > unit was used when.