The monitor() function can also fail at different times than during completion. If it fails during completion, the error message will already indicate that. Finally, the error messages already indicate the job type or ID, so no information is lost by getting rid of the added prefix.
Signed-off-by: Fiona Ebner <[email protected]> --- src/PVE/QemuServer/Blockdev.pm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index be9f588a..5846ac69 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -1085,12 +1085,7 @@ sub blockdev_commit { # 'block-commit' will complete automatically. my $complete = $src_snap && $src_snap ne 'current' ? 'auto' : 'complete'; - eval { - PVE::QemuServer::BlockJob::monitor($vmid, undef, $jobs, $complete, 0, 'commit'); - }; - if ($@) { - die "Failed to complete block commit: $@\n"; - } + PVE::QemuServer::BlockJob::monitor($vmid, undef, $jobs, $complete, 0, 'commit'); blockdev_delete( $storecfg, $vmid, $drive, $src_file_blockdev, $src_fmt_blockdev, $src_snap, @@ -1164,10 +1159,7 @@ sub blockdev_stream { mon_cmd($vmid, 'block-stream', %$options); $jobs->{$job_id} = {}; - eval { PVE::QemuServer::BlockJob::monitor($vmid, undef, $jobs, 'auto', 0, 'stream'); }; - if ($@) { - die "Failed to complete block stream: $@\n"; - } + PVE::QemuServer::BlockJob::monitor($vmid, undef, $jobs, 'auto', 0, 'stream'); blockdev_delete($storecfg, $vmid, $drive, $snap_file_blockdev, $snap_fmt_blockdev, $snap); } -- 2.47.3
