From: Mira Limbeck <m.limbeck@proxmox.com>
To: Thomas Lamprecht <t.lamprecht@proxmox.com>,
Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 qemu-server] fix cloning/restoring of cloudinit disks in raw format
Date: Tue, 15 Dec 2020 15:44:32 +0100 [thread overview]
Message-ID: <053f1991-d220-f6c0-15cc-1d23c2956857@proxmox.com> (raw)
In-Reply-To: <a54eeb72-dada-3cab-a2a8-4c25da6bbfe6@proxmox.com>
On 12/15/20 2:57 PM, Thomas Lamprecht wrote:
> On 02.12.20 13:50, Mira Limbeck wrote:
>> We only added the format extension when it was not 'raw'. But on file level
>> storages we always require it. To fix this, always add the format
>> extension if the storage provides the 'path' property.
>> This is the same logic we use in create_disks for cloudinit disks.
>>
>> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
>> ---
>> v2:
>> - added the same fix when restoring from backup
>>
> clone seems to be fine, even if I slowly start to feel real hatred for those
> cloudinit disk edge cases, anyway, is there an actual reason why we need to
> restore that disk - isn't in gonna get regenerated on first start anyway?
We don't actually restore the disk, but we have to allocate it to
account for a possibly new VMID as well as a different storage (e.g.
directory storage with the VMID as part of the path).
>
>> PVE/QemuServer.pm | 10 ++++++++--
>> 1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
>> index 4989938..412113e 100644
>> --- a/PVE/QemuServer.pm
>> +++ b/PVE/QemuServer.pm
>> @@ -5797,7 +5797,10 @@ my $restore_allocate_devices = sub {
>> my $name;
>> if ($d->{is_cloudinit}) {
>> $name = "vm-$vmid-cloudinit";
>> - $name .= ".$d->{format}" if $d->{format} ne 'raw';
>> + my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
>> + if ($scfg->{path}) {
>> + $name .= ".$d->{format}";
>> + }
>> }
>>
>> my $volid = PVE::Storage::vdisk_alloc(
>> @@ -6945,7 +6948,10 @@ sub clone_disk {
>> my $size = undef;
>> if (drive_is_cloudinit($drive)) {
>> $name = "vm-$newvmid-cloudinit";
>> - $name .= ".$dst_format" if $dst_format ne 'raw';
>> + my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
>> + if ($scfg->{path}) {
>> + $name .= ".$dst_format";
>> + }
>> $snapname = undef;
>> $size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE;
>> } elsif ($drivename eq 'efidisk0') {
>>
>
next prev parent reply other threads:[~2020-12-15 14:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 12:50 Mira Limbeck
2020-12-15 13:57 ` Thomas Lamprecht
2020-12-15 14:44 ` Mira Limbeck [this message]
2020-12-15 15:18 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=053f1991-d220-f6c0-15cc-1d23c2956857@proxmox.com \
--to=m.limbeck@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=t.lamprecht@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox