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 8BD9E60EAA for ; Thu, 3 Feb 2022 13:42:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4C9CB26CA6 for ; Thu, 3 Feb 2022 13:42:41 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C976D26C9D for ; Thu, 3 Feb 2022 13:42:40 +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 9C47844BD4 for ; Thu, 3 Feb 2022 13:42:40 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 3 Feb 2022 13:41:41 +0100 Message-Id: <20220203124143.1931377-21-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220203124143.1931377-1-f.gruenbichler@proxmox.com> References: <20220203124143.1931377-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.207 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [storage.pm] Subject: [pve-devel] [PATCH v4 storage 2/4] storage_migrate: pull out snapshot decision 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, 03 Feb 2022 12:42:41 -0000 into new top-level helper for re-use with remote migration. Signed-off-by: Fabian Grünbichler --- Notes: v4: - correctly use source storage for decision - fold fixup into correct patch PVE/Storage.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 05be3dd..93ae3ac 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -643,6 +643,14 @@ my $volname_for_storage = sub { } }; +# whether a migration snapshot is needed for a given storage +sub storage_migrate_snapshot { + my ($cfg, $storeid) = @_; + my $scfg = storage_config($cfg, $storeid); + + return $scfg->{type} eq 'zfspool' || $scfg->{type} eq 'btrfs'; +} + sub storage_migrate { my ($cfg, $volid, $target_sshinfo, $target_storeid, $opts, $logfunc) = @_; @@ -688,10 +696,8 @@ sub storage_migrate { my $migration_snapshot; if (!defined($snapshot)) { - if ($scfg->{type} eq 'zfspool' || $scfg->{type} eq 'btrfs') { - $migration_snapshot = 1; - $snapshot = '__migration__'; - } + $migration_snapshot = storage_migrate_snapshot($cfg, $storeid); + $snapshot = '__migration__' if $migration_snapshot; } my @formats = volume_transfer_formats($cfg, $volid, $target_volid, $snapshot, $base_snapshot, $with_snapshots); -- 2.30.2