From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.gruenbichler@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 3F41A71485
for <pve-devel@lists.proxmox.com>; Thu, 10 Jun 2021 14:36:21 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 363CE2F6E7
for <pve-devel@lists.proxmox.com>; Thu, 10 Jun 2021 14:35:51 +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 7060A2F6DC
for <pve-devel@lists.proxmox.com>; Thu, 10 Jun 2021 14:35:50 +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 471CF46756
for <pve-devel@lists.proxmox.com>; Thu, 10 Jun 2021 14:35:50 +0200 (CEST)
Date: Thu, 10 Jun 2021 14:35:43 +0200
From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
References: <20210609131852.167416-1-w.bumiller@proxmox.com>
<20210609131852.167416-8-w.bumiller@proxmox.com>
In-Reply-To: <20210609131852.167416-8-w.bumiller@proxmox.com>
MIME-Version: 1.0
User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid)
Message-Id: <1623328337.kyeh01gy04.astroid@nora.none>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.874 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. [proxmox.com, migrate.pm, lxc.pm]
Subject: Re: [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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2021 12:36:21 -0000
On June 9, 2021 3:18 pm, Wolfgang Bumiller wrote:
> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> ---
> src/PVE/LXC.pm | 4 +++-
> src/PVE/LXC/Migrate.pm | 7 ++++---
> 2 files changed, 7 insertions(+), 4 deletions(-)
>=20
> 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 {
> =20
> eval {
> my $do_format =3D 0;
> - if ($scfg->{type} eq 'dir' || $scfg->{type} eq 'nfs' || $scfg->{type} e=
q 'cifs' ) {
> + if ($scfg->{type} eq 'dir' || $scfg->{type} eq 'nfs' || $scfg->{type} e=
q 'cifs'
> + || $scfg->{type} eq 'btrfs'
> + ) {
> if ($size_kb > 0) {
> $volid =3D 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'
comment needs update ;)
> - 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) =3D PVE::Storage::parse_volume_id($volid);
> my $scfg =3D PVE::Storage::storage_config($self->{storecfg}, $sid)=
;
> =20
> - my $migratable =3D ($scfg->{type} eq 'dir') || ($scfg->{type} eq 'z=
fspool') ||
> - ($scfg->{type} eq 'lvmthin') || ($scfg->{type} eq 'lvm');
> + my $migratable =3D ($scfg->{type} eq 'dir') || ($scfg->{type} eq 'z=
fspool')
> + || ($scfg->{type} eq 'lvmthin') || ($scfg->{type} eq 'lvm')
> + || ($scfg->{type} eq 'btrfs');
same as for qemu-server, IMHO we should think about dropping this (or=20
moving it to storage plugins as a flag).
> =20
> die "storage type '$scfg->{type}' not supported\n"
> if !$migratable;
> --=20
> 2.30.2
>=20
>=20
>=20
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>=20
>=20
>=20