From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH/RFC v2 qemu-server 2/3] restore_vma_archive: get rid of oldtimeout handling
Date: Wed, 12 Aug 2020 12:01:26 +0200 [thread overview]
Message-ID: <20200812100127.29722-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20200812100127.29722-1-f.ebner@proxmox.com>
Assume that the function is called within a worker not restricted by
any timeout. This is true currently, because the only path leading to
restore_vma_archive is via restore_file_archive being called within a
worker by the create_vm API call.
Avoid generic timeout error message.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
New in v2
PVE/QemuServer.pm | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 7169006..794819b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6162,7 +6162,6 @@ sub restore_vma_archive {
$add_pipe->(['vma', 'extract', '-v', '-r', $mapfifo, $readfrom, $tmpdir]);
- my $oldtimeout;
my $timeout = 5;
my $devinfo = {};
@@ -6261,9 +6260,9 @@ 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 reading device map\n"; };
- $oldtimeout = alarm($timeout);
+ alarm($timeout);
my $parser = sub {
my $line = shift;
@@ -6274,11 +6273,7 @@ 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 restore old timeout
- my $tmp = $oldtimeout || 0;
- $oldtimeout = undef;
- alarm($tmp);
-
+ alarm(0);
&$print_devmap();
print $fifofh "done\n";
close($fifofh);
@@ -6290,7 +6285,7 @@ sub restore_vma_archive {
};
my $err = $@;
- alarm($oldtimeout) if $oldtimeout;
+ alarm(0);
$restore_deactivate_volumes->($cfg, $devinfo);
--
2.20.1
next prev parent 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 [pve-devel] [PATCH v2 qemu-server 1/3] Fix #2816: remove timeout for allocation on restore Fabian Ebner
2020-08-12 10:01 ` Fabian Ebner [this message]
2020-08-20 8:55 ` [pve-devel] [PATCH/RFC v2 qemu-server 2/3] restore_vma_archive: get rid of oldtimeout handling 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-2-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