proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 17:30:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vma restore: improve timeout error messages

Browse Source 
The generic "got timeout" message cannot be associated to a certain
code path and also isn't very user-friendly. Use dedicated messages
for each stage and also suggest why the timeout for reading the header
might have happened, i.e. because it was corrupted.

Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-06-18 09:52:47 +02:00 committed by Thomas Lamprecht
parent daf64a27b9
commit 4e06882ba5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/QemuServer.pm
View File

@ -7537,15 +7537,17 @@ sub restore_vma_archive {
my $oldtimeout;
eval {
my $timeout_message = "got timeout preparing VMA restore\n";
# enable interrupts
local $SIG{INT} =
local $SIG{TERM} =
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 $timeout_message; };
$oldtimeout = alarm(5); # for reading the VMA header - might hang with a corrupted one
$timeout_message = "got timeout reading VMA header - corrupted?\n";
my $parser = sub {
my $line = shift;
@ -7556,6 +7558,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: /) {
$timeout_message = "got timeout during VMA restore\n";
# we correctly received the vma config, so we can disable
# the timeout now for disk allocation
alarm($oldtimeout || 0);