From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 2DD821FF13F for ; Thu, 12 Feb 2026 16:36:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 59BD614229; Thu, 12 Feb 2026 16:36:46 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 3/3] blockdev: avoid potentially misleading error messages when block job monitor fails Date: Thu, 12 Feb 2026 16:36:24 +0100 Message-ID: <20260212153638.476233-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260212153638.476233-1-f.ebner@proxmox.com> References: <20260212153638.476233-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1770910598797 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: KIDXJ4YO6CNSFFWPCL7LE3TNKVA7CNNB X-Message-ID-Hash: KIDXJ4YO6CNSFFWPCL7LE3TNKVA7CNNB X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- New in v2. 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