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 297D970F65 for ; Wed, 9 Jun 2021 15:19:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 27418250AD for ; Wed, 9 Jun 2021 15:19:00 +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 E24D225066 for ; Wed, 9 Jun 2021 15:18:58 +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 BC6854674D for ; Wed, 9 Jun 2021 15:18:58 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 9 Jun 2021 15:18:51 +0200 Message-Id: <20210609131852.167416-8-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210609131852.167416-1-w.bumiller@proxmox.com> References: <20210609131852.167416-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.922 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. [lxc.pm, migrate.pm] Subject: [pve-devel] [PATCH container 2/2] 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: Wed, 09 Jun 2021 13:19:00 -0000 Signed-off-by: Wolfgang Bumiller --- src/PVE/LXC.pm | 4 +++- src/PVE/LXC/Migrate.pm | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index bb1cbdb..9407d24 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1871,7 +1871,9 @@ sub alloc_disk { eval { my $do_format = 0; - if ($scfg->{type} eq 'dir' || $scfg->{type} eq 'nfs' || $scfg->{type} eq 'cifs' ) { + if ($scfg->{type} eq 'dir' || $scfg->{type} eq 'nfs' || $scfg->{type} eq 'cifs' + || $scfg->{type} eq 'btrfs' + ) { if ($size_kb > 0) { $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw', undef, $size_kb); diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index 4370a3d..15c6027 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -154,7 +154,7 @@ sub phase1 { if (defined($snapname)) { # we cannot migrate shapshots on local storage # exceptions: 'zfspool' - if (($scfg->{type} eq 'zfspool')) { + if ($scfg->{type} eq 'zfspool' || $scfg->{type} eq 'btrfs') { return; } die "non-migratable snapshot exists\n"; @@ -218,8 +218,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