From: Matthias Heiserer <m.heiserer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v4] fix 3886: QEMU restore: verify storage allows images before writing
Date: Thu, 24 Feb 2022 11:45:59 +0100 [thread overview]
Message-ID: <20220224104559.382734-1-m.heiserer@proxmox.com> (raw)
When restoring a backup and the storage the disks would be created on
doesn't allow 'images', the process errors without cleanup.
This is the same behaviour we currently have when the storage is
disabled.
Adds the Datastore.AllocateSpace check to cloudinit drives.
Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
---
Thanks to Fabian!
Changes from v3:
+ Restore a line I accidentally deleted
Changes from v2:
+ Also check Datastore.AllocateSpace permissions for cloudinit device
+ Move content type check closer to allocate permission check
Changes from v1:
+ Check content type for cloud init drives
PVE/QemuServer.pm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a99f1a5..a07a4eb 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6249,6 +6249,10 @@ my $parse_backup_hints = sub {
$devinfo->{$devname}->{format} = $format;
$devinfo->{$devname}->{storeid} = $storeid;
+ my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+ die "Content type 'images' is not available on storage '$storeid'\n"
+ if !$scfg->{content}->{images};
+
# check permission on storage
my $pool = $options->{pool}; # todo: do we need that?
if ($user ne 'root@pam') {
@@ -6265,6 +6269,12 @@ my $parse_backup_hints = sub {
my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
my $format = qemu_img_format($scfg, $volname); # has 'raw' fallback
+ die "Content type 'images' is not available on storage '$storeid'\n"
+ if !$scfg->{content}->{images};
+ if ($user ne 'root@pam') {
+ $rpcenv->check($user, "/storage/$storeid", ['Datastore.AllocateSpace']);
+ }
+
$virtdev_hash->{$virtdev} = {
format => $format,
storeid => $storeid,
--
2.30.2
next reply other threads:[~2022-02-24 10:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-24 10:45 Matthias Heiserer [this message]
2022-02-24 12:33 ` [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=20220224104559.382734-1-m.heiserer@proxmox.com \
--to=m.heiserer@proxmox.com \
--cc=pve-devel@lists.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