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 0917A1FF13F for ; Thu, 23 Apr 2026 14:41:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A054616F41; Thu, 23 Apr 2026 14:41:01 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 6/7] agent: fs freeze: harmonize checks for guest fs freeze Date: Thu, 23 Apr 2026 14:35:17 +0200 Message-ID: <20260423124004.115303-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260423124004.115303-1-f.ebner@proxmox.com> References: <20260423124004.115303-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: 1776947919245 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.008 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: HQZDHBEQQJ237BS5UQTIP2VGWEUOZGTZ X-Message-ID-Hash: HQZDHBEQQJ237BS5UQTIP2VGWEUOZGTZ 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: Puts the logic inside the agent module, rather than duplicating it in three different places. Signed-off-by: Fiona Ebner --- Changes in v2: * Adapt to new should_fs_freeze() function. * Use subroutine signature. * Rename guest_fsfreeze_applicable() to guest_fs_freeze_applicable(). * Simplify log function (usage) in guest_fsfreeze_applicable(). * Drop $is_backup argument from guest_fs_freeze_applicable() now that there is no backup-specific option anymore (is an alias for the general one). src/PVE/QemuConfig.pm | 14 ++++++-------- src/PVE/QemuServer/Agent.pm | 31 +++++++++++++++++++++++++++++++ src/PVE/QemuServer/BlockJob.pm | 11 ++--------- src/PVE/VZDump/QemuServer.pm | 20 +++++++------------- 4 files changed, 46 insertions(+), 30 deletions(-) diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index eedb34f9..5feae68d 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -292,17 +292,15 @@ sub __snapshot_check_running { sub __snapshot_check_freeze_needed { my ($class, $vmid, $config, $save_vmstate) = @_; + my $freeze_needed = 0; my $running = $class->__snapshot_check_running($vmid); + if (!$save_vmstate) { - return ( - $running, - $running - && PVE::QemuServer::Agent::should_fs_freeze($config->{agent}) - && PVE::QemuServer::Agent::qga_check_running($vmid), - ); - } else { - return ($running, 0); + $freeze_needed = + PVE::QemuServer::Agent::guest_fs_freeze_applicable($config->{agent}, $vmid); } + + return ($running, $freeze_needed); } sub __snapshot_freeze { diff --git a/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm index e63b09f2..c8cd334f 100644 --- a/src/PVE/QemuServer/Agent.pm +++ b/src/PVE/QemuServer/Agent.pm @@ -276,4 +276,35 @@ sub guest_fs_thaw($vmid) { return; } +=head3 guest_fs_freeze_applicable + + if (guest_fs_freeze_applicable($agent_str, $vmid, $logfunc)) { + guest_fs_freeze($vmid); + } + +Check if the file systems of the guest C<$vmid> should be frozen according to the guest agent +property string C<$agent_str> and if freezing is actionable in practice, i.e. guest agent running. +Logs a message if skipped. Using a custom log function via C<$logfunc> is supported. Otherwise, +C and C will be used. + +=cut + +sub guest_fs_freeze_applicable($agent_str, $vmid, $logfunc = undef) { + $logfunc //= sub($msg, $level = 'info') { + $level eq 'info' ? print("$msg\n") : warn("$msg\n"); + }; + + if (!should_fs_freeze($agent_str)) { + $logfunc->("skipping guest filesystem freeze - disabled in VM options"); + return; + } + + if (!qga_check_running($vmid, 1)) { + $logfunc->("skipping guest filesystem freeze - agent configured but not running?"); + return; + } + + return 1; +} + 1; diff --git a/src/PVE/QemuServer/BlockJob.pm b/src/PVE/QemuServer/BlockJob.pm index 93a1ce60..3fc5af3b 100644 --- a/src/PVE/QemuServer/BlockJob.pm +++ b/src/PVE/QemuServer/BlockJob.pm @@ -162,20 +162,13 @@ sub monitor { last if $completion eq 'skip' || $completion eq 'auto'; if ($vmiddst && $vmiddst != $vmid) { - my $freeze_enabled = PVE::QemuServer::Agent::should_fs_freeze($qga); - my $should_fsfreeze = $freeze_enabled && qga_check_running($vmid); + my $should_fsfreeze = + PVE::QemuServer::Agent::guest_fs_freeze_applicable($qga, $vmid); if ($should_fsfreeze) { print "issuing guest agent 'guest-fsfreeze-freeze' command\n"; eval { PVE::QemuServer::Agent::guest_fs_freeze($vmid); }; warn $@ if $@; } else { - if (!$freeze_enabled) { - print "skipping guest-agent 'guest-fsfreeze-freeze', disabled in VM" - . " options\n"; - } else { - print "skipping guest agent 'guest-fsfreeze-freeze' command: the" - . " agent is not running inside of the guest\n"; - } print "suspend vm\n"; eval { PVE::QemuServer::RunState::vm_suspend($vmid, 1); }; warn $@ if $@; diff --git a/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm index 9952cff1..86909d28 100644 --- a/src/PVE/VZDump/QemuServer.pm +++ b/src/PVE/VZDump/QemuServer.pm @@ -1098,20 +1098,14 @@ sub qga_fs_freeze { || !$self->{vm_was_running} || $self->{vm_was_paused}; - my $conf = $self->{vmlist}->{$vmid}; + my $agent_str = $self->{vmlist}->{$vmid}->{agent}; - if (!PVE::QemuServer::Agent::get_qga_key($conf, 'enabled')) { - $self->loginfo("skipping guest-agent 'fs-freeze', agent not configured in VM options"); - return; - } - - if (!PVE::QemuServer::Agent::qga_check_running($vmid, 1)) { - $self->loginfo("skipping guest-agent 'fs-freeze', agent configured but not running?"); - return; - } - - if (!PVE::QemuServer::Agent::should_fs_freeze($conf->{agent})) { - $self->loginfo("skipping guest-agent 'fs-freeze', disabled in VM options"); + my $logfunc = sub { + my ($msg, $level) = @_; # Note that msg and level are swapped intentionally here. + $level //= 'info'; + $self->log($level, $msg); + }; + if (!PVE::QemuServer::Agent::guest_fs_freeze_applicable($agent_str, $vmid, $logfunc)) { return; } -- 2.47.3