From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 01CC31FF0B0 for ; Fri, 09 Oct 2026 15:32:36 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 5B01D21740; Fri, 09 Oct 2026 15:32:32 +0200 (CEST) Content-Type: text/plain; charset=UTF-8 Date: Fri, 09 Oct 2026 15:32:26 +0200 Message-Id: Subject: Re: [PATCH ha-manager v3 04/21] next state {stopped,started}: factor out helper to handle motion command From: "Daniel Kral" To: "Fiona Ebner" , Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: aerc 0.22.0-10-g6373ac9d2179-dirty References: <20260918160841.128088-1-f.ebner@proxmox.com> <20260918160841.128088-5-f.ebner@proxmox.com> In-Reply-To: <20260918160841.128088-5-f.ebner@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791552746677 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.876 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: N7DC242THR2B54JCFNO6NB7U3BZ5MXAA X-Message-ID-Hash: N7DC242THR2B54JCFNO6NB7U3BZ5MXAA 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: On Fri Sep 18, 2026 at 6:08 PM CEST, Fiona Ebner wrote: > Deduplicate the code before extending it for supporting migration > options. The only intended functional change is an additional log line > with the motion command and target in case of next_state_stopped(). Would be nice to add the additional log line in a patch before this so this patch remains free of functional changes then :) > > Signed-off-by: Fiona Ebner > --- > > New in v3. > > src/PVE/HA/Manager.pm | 55 +++++++++---------- > .../test-relocate-to-inactive-node/log.expect | 1 + > src/test/test-service-stopped3/log.expect | 1 + > 3 files changed, 27 insertions(+), 30 deletions(-) > > diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm > index 5840a76..e0c1858 100644 > --- a/src/PVE/HA/Manager.pm > +++ b/src/PVE/HA/Manager.pm > @@ -1290,6 +1290,29 @@ sub next_state_migrate_relocate { > } > } > =20 > +my sub next_state_handle_motion_command { Hm, "next_state_" is only used for the individual state (transition) functions, while this is a helper, so I'm unsure to use the prefix here. Would just "handle{,_resource}_motion_command" work for you too? > + my ($self, $cmd, $sid, $sd) =3D @_; > + > + my $haenv =3D $self->{haenv}; > + my $ns =3D $self->{ns}; > + > + my $target =3D shift @{ $sd->{cmd} }; nit: pre-existing but I'd prefer the postfix $sd->{cmd}->@* here > + if (!$ns->node_is_online($target)) { > + $haenv->log('err', "ignore service '$sid' $cmd request - node '$= target' not online"); > + } elsif ($sd->{node} eq $target) { > + $haenv->log( > + 'info', > + "ignore service '$sid' $cmd request - service already on nod= e '$target'", > + ); > + } else { > + $haenv->log('info', "$cmd service '$sid' to node '$target'"); > + &$change_service_state($self, $sid, $cmd, node =3D> $sd->{node},= target =3D> $target); nit: pre-existing but this could use the postfix -> > + return 1; > + } > + > + return; > +} > + > sub next_state_stopped { > my ($self, $sid, $cd, $sd, $lrm_res) =3D @_; > =20 > @@ -1307,17 +1330,7 @@ sub next_state_stopped { > my $cmd =3D shift @{ $sd->{cmd} }; > =20 > if ($cmd eq 'migrate' || $cmd eq 'relocate') { > - my $target =3D shift @{ $sd->{cmd} }; > - if (!$ns->node_is_online($target)) { > - $haenv->log('err', > - "ignore service '$sid' $cmd request - node '$target'= not online"); > - } elsif ($sd->{node} eq $target) { > - $haenv->log( > - 'info', > - "ignore service '$sid' $cmd request - service alread= y on node '$target'", > - ); > - } else { > - &$change_service_state($self, $sid, $cmd, node =3D> $sd-= >{node}, target =3D> $target); > + if (next_state_handle_motion_command($self, $cmd, $sid, $sd)= ) { It would be nice to have a comment here that this calls change_service_state() with $state =3D $cmd if the assertions don't fail, so that it stays easy to enumerate the possible transitions from reading the code in next_state_stopped() alone. It could be nice to split this into e.g. assert_valid_resource_motion(), to check whether to ignore the crm command (for nex_state_started, next_state_stopped, and update_crm_command), and a handle_resource_motion_command() to actually make the state transition, but might be pedantic so no hard feelings. > return; > } > } elsif ($cmd eq 'stop') { > @@ -1431,25 +1444,7 @@ sub next_state_started { > my $cmd =3D shift @{ $sd->{cmd} }; > =20 > if ($cmd eq 'migrate' || $cmd eq 'relocate') { > - my $target =3D shift @{ $sd->{cmd} }; > - if (!$ns->node_is_online($target)) { > - $haenv->log( > - 'err', > - "ignore service '$sid' $cmd request - node '$tar= get' not online", > - ); > - } elsif ($sd->{node} eq $target) { > - $haenv->log( > - 'info', > - "ignore service '$sid' $cmd request - service al= ready on node '$target'", > - ); > - } else { > - $haenv->log('info', "$cmd service '$sid' to node '$t= arget'"); > - &$change_service_state( > - $self, $sid, $cmd, > - node =3D> $sd->{node}, > - target =3D> $target, > - ); > - } > + next_state_handle_motion_command($self, $cmd, $sid, $sd)= ; Same here as well > } elsif ($cmd eq 'stop') { > my $timeout =3D shift @{ $sd->{cmd} }; > if ($timeout =3D=3D 0) { > diff --git a/src/test/test-relocate-to-inactive-node/log.expect b/src/tes= t/test-relocate-to-inactive-node/log.expect > index 266fb48..8c9d892 100644 > --- a/src/test/test-relocate-to-inactive-node/log.expect > +++ b/src/test/test-relocate-to-inactive-node/log.expect > @@ -21,6 +21,7 @@ info 25 node3/lrm: status change wait_for_agent_= lock =3D> active > info 40 node1/crm: service 'vm:103': state changed from 'request_= stop' to 'stopped' > info 120 cmdlist: execute service vm:103 relocate node2 > info 120 node1/crm: got crm command: relocate vm:103 node2 > +info 120 node1/crm: relocate service 'vm:103' to node 'node2' > info 120 node1/crm: service 'vm:103': state changed from 'stopped'= to 'relocate' (node =3D node3, target =3D node2) > info 123 node2/lrm: got lock 'ha_agent_node2_lock' > info 123 node2/lrm: status change wait_for_agent_lock =3D> active > diff --git a/src/test/test-service-stopped3/log.expect b/src/test/test-se= rvice-stopped3/log.expect > index e08b54c..d4737a7 100644 > --- a/src/test/test-service-stopped3/log.expect > +++ b/src/test/test-service-stopped3/log.expect > @@ -21,6 +21,7 @@ info 25 node3/lrm: status change wait_for_agent_= lock =3D> active > info 40 node1/crm: service 'fa:1501': state changed from 'request= _stop' to 'stopped' > info 120 cmdlist: execute service fa:1501 migrate node2 > info 120 node1/crm: got crm command: migrate fa:1501 node2 > +info 120 node1/crm: migrate service 'fa:1501' to node 'node2' > info 120 node1/crm: service 'fa:1501': state changed from 'stopped= ' to 'migrate' (node =3D node3, target =3D node2) > info 123 node2/lrm: got lock 'ha_agent_node2_lock' > info 123 node2/lrm: status change wait_for_agent_lock =3D> active