From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 1/2] Fix #2816: increase timeout for allocation on restore
Date: Tue, 4 Aug 2020 13:32:43 +0200 [thread overview]
Message-ID: <20200804113244.26810-1-f.ebner@proxmox.com> (raw)
qcow2 images are allocated with --preallocation=metadata,
which can take a while for large images.
Avoid using 'got timeout' as an error message by itself,
to make it clearer where a timeout occured.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/QemuServer.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 0a09f3a..8b0b2c8 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6261,7 +6261,7 @@ sub restore_vma_archive {
local $SIG{QUIT} =
local $SIG{HUP} =
local $SIG{PIPE} = sub { die "interrupted by signal\n"; };
- local $SIG{ALRM} = sub { die "got timeout\n"; };
+ local $SIG{ALRM} = sub { die "got timeout preparing device images\n"; };
$oldtimeout = alarm($timeout);
@@ -6275,9 +6275,9 @@ sub restore_vma_archive {
$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
+ # the timeout now for disk allocation (set to 1 hour, so
# that we always timeout if something goes wrong)
- alarm(600);
+ alarm(60 * 60);
&$print_devmap();
print $fifofh "done\n";
my $tmp = $oldtimeout || 0;
--
2.20.1
next reply other threads:[~2020-08-04 11:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 11:32 Fabian Ebner [this message]
2020-08-04 11:32 ` [pve-devel] [PATCH qemu-server 2/2] Add missing die statements Fabian Ebner
2020-08-11 12:35 ` [pve-devel] applied: " Fabian Grünbichler
2020-08-11 12:36 ` [pve-devel] [PATCH qemu-server 1/2] Fix #2816: increase timeout for allocation on restore Fabian Grünbichler
2020-08-12 8:38 ` 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=20200804113244.26810-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