From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 448E31FF0BC for ; Thu, 15 Oct 2026 14:52:08 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 74C7B216B2; Thu, 15 Oct 2026 14:51:23 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v4 07/27] next state {stopped,started}: factor out helper to handle motion command Date: Thu, 15 Oct 2026 14:50:41 +0200 Message-ID: <20261015125112.174954-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261015125112.174954-1-f.ebner@proxmox.com> References: <20261015125112.174954-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: 1792068676527 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.417 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: JKC73FX2YISP7BSCFM3OCO6KQTX2FJPQ X-Message-ID-Hash: JKC73FX2YISP7BSCFM3OCO6KQTX2FJPQ 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: Deduplicate the code before extending it for supporting migration options. No functional change is intended. Signed-off-by: Fiona Ebner --- Changes in v4: * Patch was split and check_resource_motion_valid() introduced as a separate patch. src/PVE/HA/Manager.pm | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index dfcdca2..eecf598 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -1299,6 +1299,24 @@ sub next_state_migrate_relocate { } } +# Calls change_service_state() with $state=$cmd if successful. Returns a boolean indicating success. +my sub handle_resource_motion_command { + my ($self, $cmd, $sid, $sd) = @_; + + my $haenv = $self->{haenv}; + my $ns = $self->{ns}; + + my $target = shift $sd->{cmd}->@*; + my $logprefix = "ignore service '$sid' $cmd request"; + if (check_resource_motion_valid($self, $target, $sd, $logprefix)) { + $haenv->log('info', "$cmd service '$sid' to node '$target'"); + $change_service_state->($self, $sid, $cmd, node => $sd->{node}, target => $target); + return 1; + } + + return 0; +} + sub next_state_stopped { my ($self, $sid, $cd, $sd, $lrm_res) = @_; @@ -1316,11 +1334,8 @@ sub next_state_stopped { my $cmd = shift @{ $sd->{cmd} }; if ($cmd eq 'migrate' || $cmd eq 'relocate') { - my $target = shift @{ $sd->{cmd} }; - my $logprefix = "ignore service '$sid' $cmd request"; - if (check_resource_motion_valid($self, $target, $sd, $logprefix)) { - $haenv->log('info', "$cmd service '$sid' to node '$target'"); - &$change_service_state($self, $sid, $cmd, node => $sd->{node}, target => $target); + # If the motion command is handled, calls change_service_state() with $state=$cmd. + if (handle_resource_motion_command($self, $cmd, $sid, $sd)) { return; } } elsif ($cmd eq 'stop') { @@ -1434,16 +1449,8 @@ sub next_state_started { my $cmd = shift @{ $sd->{cmd} }; if ($cmd eq 'migrate' || $cmd eq 'relocate') { - my $target = shift @{ $sd->{cmd} }; - my $logprefix = "ignore service '$sid' $cmd request"; - if (check_resource_motion_valid($self, $target, $sd, $logprefix)) { - $haenv->log('info', "$cmd service '$sid' to node '$target'"); - &$change_service_state( - $self, $sid, $cmd, - node => $sd->{node}, - target => $target, - ); - } + # If the motion command is handled, calls change_service_state() with $state=$cmd. + handle_resource_motion_command($self, $cmd, $sid, $sd); } elsif ($cmd eq 'stop') { my $timeout = shift @{ $sd->{cmd} }; if ($timeout == 0) { -- 2.47.3