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 A90726158E for ; Wed, 9 Feb 2022 14:08:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E747419E7 for ; Wed, 9 Feb 2022 14:08:08 +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 D9F7C18AE for ; Wed, 9 Feb 2022 14:08:03 +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 A38F446D9F for ; Wed, 9 Feb 2022 14:08:03 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 9 Feb 2022 14:07:48 +0100 Message-Id: <20220209130750.902245-20-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209130750.902245-1-f.gruenbichler@proxmox.com> References: <20220209130750.902245-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.200 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 - Subject: [pve-devel] [PATCH v5 storage 1/3] storage_migrate_snapshot: skip for btrfs without snapshots 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, 09 Feb 2022 13:08:09 -0000 this allows migrating from btrfs to other raw+size accepting storages, provided no snapshots exist. Signed-off-by: Fabian Grünbichler --- Notes: new in v5 PVE/Storage.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 93ae3ac..866b5cd 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -645,10 +645,10 @@ my $volname_for_storage = sub { # whether a migration snapshot is needed for a given storage sub storage_migrate_snapshot { - my ($cfg, $storeid) = @_; + my ($cfg, $storeid, $existing_snapshots) = @_; my $scfg = storage_config($cfg, $storeid); - return $scfg->{type} eq 'zfspool' || $scfg->{type} eq 'btrfs'; + return $scfg->{type} eq 'zfspool' || ($scfg->{type} eq 'btrfs' && $existing_snapshots); } sub storage_migrate { @@ -696,7 +696,7 @@ sub storage_migrate { my $migration_snapshot; if (!defined($snapshot)) { - $migration_snapshot = storage_migrate_snapshot($cfg, $storeid); + $migration_snapshot = storage_migrate_snapshot($cfg, $storeid, $opts->{with_snapshots}); $snapshot = '__migration__' if $migration_snapshot; } -- 2.30.2