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 0536D63F29 for ; Thu, 29 Oct 2020 11:09:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EA85D274B5 for ; Thu, 29 Oct 2020 11:09:25 +0100 (CET) Received: from gaia.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) (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 id 55F90274AD for ; Thu, 29 Oct 2020 11:09:25 +0100 (CET) Received: from gaia.proxmox.com (localhost.localdomain [127.0.0.1]) by gaia.proxmox.com (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 09TA9PfC073868; Thu, 29 Oct 2020 11:09:25 +0100 Received: (from oguz@localhost) by gaia.proxmox.com (8.15.2/8.15.2/Submit) id 09TA9P2i073867; Thu, 29 Oct 2020 11:09:25 +0100 From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Thu, 29 Oct 2020 11:09:21 +0100 Message-Id: <20201029100921.73750-1-o.bektas@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.617 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [pct.pm] Subject: [pve-devel] [PATCH v2 container] pct fstrim: add 'ignore-mountpoints' parameter 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: Thu, 29 Oct 2020 10:09:56 -0000 parameter to ignore mountpoints when doing fstrim on a container root@pve:~# pct fstrim 123 /var/lib/lxc/123/rootfs/: 338.7 MiB (355094528 bytes) trimmed /var/lib/lxc/123/rootfs/test: 8.9 GiB (9576009728 bytes) trimmed root@pve:~# pct fstrim 123 --ignore-mountpoints /var/lib/lxc/123/rootfs/: 338.7 MiB (355094528 bytes) trimmed Signed-off-by: Oguz Bektas --- thanks thomas for the review :) v1->v2: * change to kebab casing * add description * revert the 'warn' change * use the regex in // src/PVE/CLI/pct.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm index df4e9f8..ff02112 100755 --- a/src/PVE/CLI/pct.pm +++ b/src/PVE/CLI/pct.pm @@ -767,6 +767,11 @@ __PACKAGE__->register_method ({ additionalProperties => 0, properties => { vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }), + 'ignore-mountpoints' => { + description => 'ignore mountpoints when doing an fstrim operation for a container.', + optional => 1, + type => 'boolean', + }, }, }, returns => { type => 'null' }, @@ -785,6 +790,7 @@ __PACKAGE__->register_method ({ PVE::LXC::Config->foreach_volume($conf, sub { my ($name, $mp) = @_; $path = $mp->{mp}; + return if $param->{'ignore-mountpoints'} && $name =~ /^mp\d+/; my $cmd = ["fstrim", "-v", "$rootdir$path"]; PVE::Tools::run_command($cmd); }); -- 2.20.1