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 3D6291FF15F for ; Mon, 16 Dec 2024 10:14:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5DC3C7695; Mon, 16 Dec 2024 10:13:21 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Mon, 16 Dec 2024 10:12:21 +0100 In-Reply-To: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> References: <20241216091229.3142660-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 v3 pve-storage 3/3] storage: vdisk_free: remove external snapshots Content-Type: multipart/mixed; boundary="===============3030882195518474525==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============3030882195518474525== 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 420EDC336C for ; Mon, 16 Dec 2024 10:13:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E13416EA3 for ; Mon, 16 Dec 2024 10:12:46 +0100 (CET) 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, 16 Dec 2024 10:12:44 +0100 (CET) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 2B0D6860942; Mon, 16 Dec 2024 10:12:32 +0100 (CET) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 6C2991084C68; Mon, 16 Dec 2024 10:12:31 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH v3 pve-storage 3/3] storage: vdisk_free: remove external snapshots Date: Mon, 16 Dec 2024 10:12:21 +0100 Message-Id: <20241216091229.3142660-8-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> References: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 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.248 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 Signed-off-by: Alexandre Derumier --- src/PVE/Storage.pm | 18 +++++++++++++++++- src/test/run_test_zfspoolplugin.pl | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 3b4f041..798544b 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -1052,7 +1052,23 @@ sub vdisk_free { my (undef, undef, undef, undef, undef, $isBase, $format) = $plugin->parse_volname($volname); - $cleanup_worker = $plugin->free_image($storeid, $scfg, $volname, $isBase, $format); + + $cleanup_worker = sub { + #remove external snapshots + activate_volumes($cfg, [ $volid ]); + my $snapshots = PVE::Storage::volume_snapshot_info($cfg, $volid); + for my $snapid (sort { $snapshots->{$b}->{order} <=> $snapshots->{$a}->{order} } keys %$snapshots) { + my $snap = $snapshots->{$snapid}; + next if $snapid eq 'current'; + next if !$snap->{volid}; + next if !$snap->{ext}; + my ($snap_storeid, $snap_volname) = parse_volume_id($snap->{volid}); + my (undef, undef, undef, undef, undef, $snap_isBase, $snap_format) = + $plugin->parse_volname($volname); + $plugin->free_image($snap_storeid, $scfg, $snap_volname, $snap_isBase, $snap_format); + } + $plugin->free_image($storeid, $scfg, $volname, $isBase, $format); + }; }); return if !$cleanup_worker; diff --git a/src/test/run_test_zfspoolplugin.pl b/src/test/run_test_zfspoolplugin.pl index 095ccb3..4ff9f22 100755 --- a/src/test/run_test_zfspoolplugin.pl +++ b/src/test/run_test_zfspoolplugin.pl @@ -6,12 +6,30 @@ use strict; use warnings; use Data::Dumper qw(Dumper); +use Test::MockModule; + use PVE::Storage; use PVE::Cluster; use PVE::Tools qw(run_command); +use PVE::RPCEnvironment; use Cwd; $Data::Dumper::Sortkeys = 1; +my $rpcenv_module; +$rpcenv_module = Test::MockModule->new('PVE::RPCEnvironment'); +$rpcenv_module->mock( + get_user => sub { + return 'root@pam'; + }, + fork_worker => sub { + my ($self, $dtype, $id, $user, $function, $background) = @_; + $function->(123456); + return '123456'; + } +); + +my $rpcenv = PVE::RPCEnvironment->init('pub'); + my $verbose = undef; my $storagename = "zfstank99"; -- 2.39.5 --===============3030882195518474525== 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 --===============3030882195518474525==--