From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 704951FF15F for ; Mon, 26 Aug 2024 13:01:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 77225115AF; Mon, 26 Aug 2024 13:01:16 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Mon, 26 Aug 2024 13:00:28 +0200 In-Reply-To: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> References: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH pve-storage 5/5] add volume_underlay_shrink Content-Type: multipart/mixed; boundary="===============9173414015759759328==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============9173414015759759328== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com 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 4D507C6994 for ; Mon, 26 Aug 2024 13:01:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 373BD10DC4 for ; Mon, 26 Aug 2024 13:00:44 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [IPv6:2a0a:1580:2000:6700::14]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 26 Aug 2024 13:00:42 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 508A481F57D; Mon, 26 Aug 2024 13:00:33 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 23277102034B; Mon, 26 Aug 2024 13:00:32 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage 5/5] add volume_underlay_shrink Date: Mon, 26 Aug 2024 13:00:28 +0200 Message-Id: <20240826110030.1744732-11-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> References: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.056 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 T_SCC_BODY_TEXT_LINE -0.01 - reduce underlay volume size to minimum used Signed-off-by: Alexandre Derumier --- src/PVE/Storage.pm | 15 +++++++++++++++ src/PVE/Storage/LVMQcow2Plugin.pm | 31 +++++++++++++++++++++++++++++++ src/PVE/Storage/Plugin.pm | 7 +++++++ 3 files changed, 53 insertions(+) diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 367b672..f3c1a2c 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -335,6 +335,21 @@ sub volume_underlay_resize { } } +sub volume_underlay_shrink { + my ($cfg, $volid) = @_; + + my ($storeid, $volname) = parse_volume_id($volid, 1); + if ($storeid) { + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + return $plugin->volume_underlay_shrink($scfg, $storeid, $volname); + } elsif ($volid =~ m|^(/.+)$| && -e $volid) { + die "trim file/device '$volid' is not possible\n"; + } else { + die "unable to parse volume ID '$volid'\n"; + } +} + sub volume_rollback_is_possible { my ($cfg, $volid, $snap, $blockers) = @_; diff --git a/src/PVE/Storage/LVMQcow2Plugin.pm b/src/PVE/Storage/LVMQcow2Plugin.pm index 2c17c69..7780270 100644 --- a/src/PVE/Storage/LVMQcow2Plugin.pm +++ b/src/PVE/Storage/LVMQcow2Plugin.pm @@ -4,6 +4,7 @@ use strict; use warnings; use IO::File; +use JSON qw(from_json); use PVE::Tools qw(run_command trim); use PVE::Storage::Plugin; @@ -203,6 +204,36 @@ sub volume_underlay_resize { run_command($cmd, errmsg => "error resizing volume '$path'"); } +sub volume_underlay_shrink { + my ($class, $scfg, $storeid, $volname) = @_; + + return if !$scfg->{sparse}; + + my ($allocated_size, $format , $required_size, undef) = volume_size_info($class, $scfg, $storeid, $volname, 5); + + #don't reduce if it's full allocated + return if $required_size == $allocated_size; + + if(!$required_size) { + warn "can't get required size, skip shrinking" if !$required_size; + } + + my $chunksize = $scfg->{chunksize} // 1; + $chunksize *= 1073741824; + my $size = $required_size + $chunksize; + my $padding = (1024 - $size % 1024) % 1024; + $size = $size + $padding; + $size = ($size/1024/1024) . "M"; + + my $path = $class->filesystem_path($scfg, $volname); + + my $cmd = ['/sbin/lvreduce', '-y', '-L', $size, $path]; + eval { + run_command($cmd, errmsg => "error shrinking volume '$path'"); + }; + warn $@ if $@; +} + sub refresh_volume { my ($class, $storeid, $scfg, $volname) = @_; diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 8ff9fbd..13b049e 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1078,6 +1078,13 @@ sub volume_underlay_resize { return undef; } +sub volume_underlay_shrink { + my ($class, $scfg, $storeid, $volname) = @_; + + # do nothing by default + return undef; +} + sub volume_snapshot { my ($class, $scfg, $storeid, $volname, $snap) = @_; -- 2.39.2 --===============9173414015759759328== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============9173414015759759328==--