From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C6CB61FF13E for ; Fri, 17 Apr 2026 14:28:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 86E9BAB8; Fri, 17 Apr 2026 14:28:07 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager 4/7] use log with warning priority instead of warn where possible Date: Fri, 17 Apr 2026 14:27:19 +0200 Message-ID: <20260417122728.330123-5-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260417122728.330123-1-d.kral@proxmox.com> References: <20260417122728.330123-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776428771659 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.080 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 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: 6TCZTBB6PLIRLSHROB6OYYTPMZ2M7RYN X-Message-ID-Hash: 6TCZTBB6PLIRLSHROB6OYYTPMZ2M7RYN X-MailFrom: d.kral@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 HA Manager should relay all output through its PVE::HA::Env::log() interface to allow consistent output. In the case for PVE::HA::Sim::Hardware::unlock_service(), the test-locked-service2 integration test didn't capture the expected behavior in its expected log output. Signed-off-by: Daniel Kral --- src/PVE/HA/Env/PVE2.pm | 2 +- src/PVE/HA/Resources/PVEVM.pm | 2 +- src/PVE/HA/Sim/Hardware.pm | 2 +- src/test/test-locked-service2/log.expect | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 68bbe8d2..782d19db 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -439,7 +439,7 @@ sub loop_end_hook { my $delay = $self->get_time() - $self->{loop_start}; - warn "loop took too long ($delay seconds)\n" if $delay > 30; + $self->log('warning', "loop took too long ($delay seconds)") if $delay > 30; } sub cluster_state_update { diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm index 1621c15b..dceb08e3 100644 --- a/src/PVE/HA/Resources/PVEVM.pm +++ b/src/PVE/HA/Resources/PVEVM.pm @@ -146,7 +146,7 @@ sub check_running { my $conf = PVE::QemuConfig->load_config($vmid, $nodename); if (defined($conf->{lock}) && $conf->{lock} eq 'backup') { my $qmpstatus = eval { PVE::QemuServer::Monitor::mon_cmd($vmid, 'query-status') }; - warn "$@\n" if $@; + $haenv->log('warning', "$@") if $@; return 0 if defined($qmpstatus) && $qmpstatus->{status} eq 'prelaunch'; } diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index 88fd64e8..4ebe2adf 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -326,7 +326,7 @@ sub unlock_service { } if (defined($lock) && $service_lock ne $lock) { - warn "found lock '$service_lock' trying to remove '$lock' lock\n"; + $self->log('warning', "found lock '$service_lock' trying to remove '$lock' lock"); return undef; } diff --git a/src/test/test-locked-service2/log.expect b/src/test/test-locked-service2/log.expect index bfdc8ab0..a932f14b 100644 --- a/src/test/test-locked-service2/log.expect +++ b/src/test/test-locked-service2/log.expect @@ -39,6 +39,15 @@ info 340 node1/crm: node 'node3': state changed from 'fence' => 'unknown' emai 340 node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3' info 340 node1/crm: service 'vm:103': state changed from 'fence' to 'recovery' info 340 node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1' +warn 340 hardware: found lock 'create' trying to remove 'backup' lock +warn 340 hardware: found lock 'create' trying to remove 'mounted' lock +warn 340 hardware: found lock 'create' trying to remove 'migrate' lock +warn 340 hardware: found lock 'create' trying to remove 'clone' lock +warn 340 hardware: found lock 'create' trying to remove 'rollback' lock +warn 340 hardware: found lock 'create' trying to remove 'snapshot' lock +warn 340 hardware: found lock 'create' trying to remove 'snapshot-delete' lock +warn 340 hardware: found lock 'create' trying to remove 'suspending' lock +warn 340 hardware: found lock 'create' trying to remove 'suspended' lock info 340 node1/crm: service 'vm:103': state changed from 'recovery' to 'started' (node = node1) info 341 node1/lrm: got lock 'ha_agent_node1_lock' info 341 node1/lrm: status change wait_for_agent_lock => active -- 2.47.3