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 3C7FF74BFC for ; Tue, 22 Jun 2021 14:19:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C12B27278 for ; Tue, 22 Jun 2021 14:18:40 +0200 (CEST) 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 7E72D26FEF for ; Tue, 22 Jun 2021 14:18:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5702744B66 for ; Tue, 22 Jun 2021 14:18:35 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 22 Jun 2021 14:18:26 +0200 Message-Id: <20210622121828.84178-8-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210622121828.84178-1-w.bumiller@proxmox.com> References: <20210622121828.84178-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.818 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [migrate.pm] Subject: [pve-devel] [PATCH v2 container 2/3] enable btrfs support via subvolumes 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: Tue, 22 Jun 2021 12:19:11 -0000 Signed-off-by: Wolfgang Bumiller --- Changes to v1: Rebased & Comment fixup. Note that I have not yet opted to switch these tests to `volume_has_feature` based ones. There are still some unresolved questions there. src/PVE/LXC/Migrate.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index ce1f7dd..95562e4 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -155,8 +155,8 @@ sub phase1 { if (defined($snapname)) { # we cannot migrate shapshots on local storage - # exceptions: 'zfspool' - if (($scfg->{type} eq 'zfspool')) { + # exceptions: 'zfspool', 'btrfs' + if ($scfg->{type} eq 'zfspool' || $scfg->{type} eq 'btrfs') { return; } die "non-migratable snapshot exists\n"; @@ -222,8 +222,9 @@ sub phase1 { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); my $scfg = PVE::Storage::storage_config($self->{storecfg}, $sid); - my $migratable = ($scfg->{type} eq 'dir') || ($scfg->{type} eq 'zfspool') || - ($scfg->{type} eq 'lvmthin') || ($scfg->{type} eq 'lvm'); + my $migratable = ($scfg->{type} eq 'dir') || ($scfg->{type} eq 'zfspool') + || ($scfg->{type} eq 'lvmthin') || ($scfg->{type} eq 'lvm') + || ($scfg->{type} eq 'btrfs'); die "storage type '$scfg->{type}' not supported\n" if !$migratable; -- 2.30.2