From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 qemu-server 1/3] Fix #2816: remove timeout for allocation on restore
Date: Wed, 12 Aug 2020 12:01:25 +0200 [thread overview]
Message-ID: <20200812100127.29722-1-f.ebner@proxmox.com> (raw)
qcow2 images are allocated with --preallocation=metadata,
which can take a while for large images.
A 5 second timeout is set before reading the device map, so it's
necessary to restore the old timeout before calling print_devmap().
Time spent allocating now falls under that old timeout.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Changes from v1:
* instead of increasing the allocation timeout,
get rid of it as Fabian suggested
PVE/QemuServer.pm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a9c0dac..7169006 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6274,15 +6274,13 @@ sub restore_vma_archive {
my ($dev_id, $size, $devname) = ($1, $2, $3);
$devinfo->{$devname} = { size => $size, dev_id => $dev_id };
} elsif ($line =~ m/^CTIME: /) {
- # we correctly received the vma config, so we can disable
- # the timeout now for disk allocation (set to 10 minutes, so
- # that we always timeout if something goes wrong)
- alarm(600);
- &$print_devmap();
- print $fifofh "done\n";
+ # we correctly received the vma config, so restore old timeout
my $tmp = $oldtimeout || 0;
$oldtimeout = undef;
alarm($tmp);
+
+ &$print_devmap();
+ print $fifofh "done\n";
close($fifofh);
}
};
--
2.20.1
next reply other threads:[~2020-08-12 10:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 10:01 Fabian Ebner [this message]
2020-08-12 10:01 ` [pve-devel] [PATCH/RFC v2 qemu-server 2/3] restore_vma_archive: get rid of oldtimeout handling Fabian Ebner
2020-08-20 8:55 ` Thomas Lamprecht
2020-08-12 10:01 ` [pve-devel] [PATCH/RFC v2 qemu-server 3/3] restore_vma_archive: remove timeout for reading the device map Fabian Ebner
2020-08-20 8:53 ` Thomas Lamprecht
2020-08-20 9:22 ` Fabian Ebner
2020-08-20 8:56 ` [pve-devel] [PATCH v2 qemu-server 1/3] Fix #2816: remove timeout for allocation on restore Thomas Lamprecht
2020-08-20 9:21 ` Fabian Ebner
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=20200812100127.29722-1-f.ebner@proxmox.com \
--to=f.ebner@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