[pve-devel] [PATCH ha-manager 0/7] Some pve-ha-simulator fixups

[pve-devel] [PATCH ha-manager 0/7] Some pve-ha-simulator fixups

[Daniel Kral]

These are a few patches to fix some things that popped up with the
recent changes for the pve-ha-simulator.

PATCH 1         smaller cleanup
PATCH 2-4       fix r/w, add default fallback, fix creating new HA
                resources in pve-ha-simulator with static service stats
PATCH 5         remove static_service_stats print statements
PATCH 6         delete static_service_stats on service deletion
PATCH 7         fix pve-ha-simulator being runnable on non-PVE envs

I tested the following things on the upstream pve-ha-simulator:

 * creating new HA resources
 * updating HA resources
 * deleting HA resources
 * re-creating HA resources with same sid
 * saving and restoring state of the HA Simulator
 * switching back and forth between basic and static load scheduler
 * migrating/relocating HA resources in the HA Simulator
 * doing all of the above on a standalone non-PVE environment:
    * switching to 'static' will make the HA Simulator fallback to
      'basic' as expected

As also stated in a patch message, it would be great to split the
fallback values out to the RTHardware alone, so that no future test
cases accidentally rely on those being set.


Daniel Kral (7):
  sim: hardware: remove service default groups
  sim: fix read and write to static service stats' maxmem
  sim: hardware: initialize default fallback static_service_stats
  sim: hardware: fix ha resource existence check in
    set_static_service_stats
  sim: hardware: do not print stat changes in set_static_service_stats
  sim: hardware: delete static service stats on service deletion
  d/rules: add new PVE dependencies from PVE::Tools to pve-ha-simulator

 debian/rules                 |  2 ++
 src/PVE/HA/Sim/Hardware.pm   | 40 ++++++++++++++++++++++--------------
 src/PVE/HA/Sim/RTHardware.pm | 11 +++++-----
 3 files changed, 32 insertions(+), 21 deletions(-)

-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH ha-manager 1/7] sim: hardware: remove service default groups

[Daniel Kral]

These groups are not enforced unless these are explicitly defined in the
HA group config, but even then it would be rather unexpected for users
if they haven't explicitly provided that information in the first place.

Furthermore these are neither used in test cases nor displayed or
modifiable in the pve-ha-simulator, so remove them.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Sim/Hardware.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm
index 688277df..fd119beb 100644
--- a/src/PVE/HA/Sim/Hardware.pm
+++ b/src/PVE/HA/Sim/Hardware.pm
@@ -456,12 +456,12 @@ sub new {
         copy("$testdir/service_config", "$statusdir/service_config");
     } else {
         my $conf = {
-            'vm:101' => { node => 'node1', group => 'prefer_node1' },
-            'vm:102' => { node => 'node2', group => 'prefer_node2' },
-            'vm:103' => { node => 'node3', group => 'prefer_node3' },
-            'vm:104' => { node => 'node1', group => 'prefer_node1' },
-            'vm:105' => { node => 'node2', group => 'prefer_node2' },
-            'vm:106' => { node => 'node3', group => 'prefer_node3' },
+            'vm:101' => { node => 'node1' },
+            'vm:102' => { node => 'node2' },
+            'vm:103' => { node => 'node3' },
+            'vm:104' => { node => 'node1' },
+            'vm:105' => { node => 'node2' },
+            'vm:106' => { node => 'node3' },
         };
         $self->write_service_config($conf);
     }
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH ha-manager 2/7] sim: fix read and write to static service stats' maxmem

[Daniel Kral]

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Sim/Hardware.pm   | 12 ++++++------
 src/PVE/HA/Sim/RTHardware.pm | 11 +++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm
index fd119beb..41d21326 100644
--- a/src/PVE/HA/Sim/Hardware.pm
+++ b/src/PVE/HA/Sim/Hardware.pm
@@ -184,9 +184,9 @@ sub set_static_service_stats {
     my $stats = $self->read_static_service_stats();
     die "no such service '$sid'" if !$stats->{$sid};
 
-    if (my $memory = $new_stats->{maxmemory}) {
-        print "setting $sid memory to $memory\n" if $memory != $stats->{$sid}->{maxmemory};
-        $stats->{$sid}->{maxmemory} = $memory;
+    if (my $memory = $new_stats->{maxmem}) {
+        print "setting $sid memory to $memory\n" if $memory != $stats->{$sid}->{maxmem};
+        $stats->{$sid}->{maxmem} = $memory;
     }
 
     if (my $cpu = $new_stats->{maxcpu}) {
@@ -699,7 +699,7 @@ sub get_cfs_state {
 #   service <sid> stop <timeout>
 #   service <sid> lock/unlock [lockname]
 #   service <sid> add <node> [<request-state=started>] [<running=0>]
-#   service <sid> set-static-stats <maxcpu> <maxmemory>
+#   service <sid> set-static-stats <maxcpu> <maxmem>
 #   service <sid> delete
 sub sim_hardware_cmd {
     my ($self, $cmdstr, $logid) = @_;
@@ -851,11 +851,11 @@ sub sim_hardware_cmd {
 
             } elsif ($action eq 'set-static-stats') {
                 die "sim_hardware_cmd: missing maxcpu for '$action' command" if !$params[0];
-                die "sim_hardware_cmd: missing maxmemory for '$action' command" if !$params[1];
+                die "sim_hardware_cmd: missing maxmem for '$action' command" if !$params[1];
 
                 $self->set_static_service_stats(
                     $sid,
-                    { maxcpu => $params[0], maxmemory => $params[1] },
+                    { maxcpu => $params[0], maxmem => $params[1] },
                 );
 
             } elsif ($action eq 'delete') {
diff --git a/src/PVE/HA/Sim/RTHardware.pm b/src/PVE/HA/Sim/RTHardware.pm
index 0287c438..9a83d098 100644
--- a/src/PVE/HA/Sim/RTHardware.pm
+++ b/src/PVE/HA/Sim/RTHardware.pm
@@ -531,8 +531,8 @@ sub show_service_add_dialog {
         $self->sim_hardware_cmd("service $sid add $service_node", 'command');
 
         my $maxcpu = $cpu_count_spin->get_value();
-        my $maxmemory = $memory_spin->get_value();
-        $self->sim_hardware_cmd("service $sid set-static-stats $maxcpu $maxmemory", 'command');
+        my $maxmem = $memory_spin->get_value();
+        $self->sim_hardware_cmd("service $sid set-static-stats $maxcpu $maxmem", 'command');
 
         $self->add_service_to_gui($sid);
     }
@@ -544,8 +544,7 @@ sub show_service_edit_dialog {
     my ($self, $sid) = @_;
 
     my $stats = $self->read_static_service_stats();
-    my $resource_stats = $stats->{$sid}
-        // { maxcpu => $DEFAULT_MAXCPU, maxmemory => $DEFAULT_MAXMEM };
+    my $resource_stats = $stats->{$sid} // { maxcpu => $DEFAULT_MAXCPU, maxmem => $DEFAULT_MAXMEM };
 
     my $cpu_label = Gtk3::Label->new('CPU Count');
     $cpu_label->set_hexpand(1);
@@ -564,7 +563,7 @@ sub show_service_edit_dialog {
 
     # There is an arbitrary limit of 10 TiB
     my $memory_spin = Gtk3::SpinButton->new_with_range(1.0, 10485760.0, 1.0);
-    $memory_spin->set_value($resource_stats->{maxmemory});
+    $memory_spin->set_value($resource_stats->{maxmem});
 
     my $memory_box = Gtk3::Box->new('horizontal', 6);
     $memory_box->add($memory_label);
@@ -600,7 +599,7 @@ sub show_service_edit_dialog {
                     $sid,
                     {
                         maxcpu => $cpu_count_spin->get_value(),
-                        maxmemory => $memory_spin->get_value(),
+                        maxmem => $memory_spin->get_value(),
                     },
                 );
             }
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH ha-manager 3/7] sim: hardware: initialize default fallback static_service_stats

[Daniel Kral]

Otherwise the already defined HA resources in the service config will
not have valid static service stats.

This intentionally doesn't set default values for HA resources, which
don't have any static service stats set, if the static_service_stats
file exists, to prevent test cases relying on fallback values.

Currently, test cases do not depend on any automatically generated
config files. In the future, creating these files as fallbacks should be
moved to the pve-ha-simulator entirely to prevent test cases relying on
them anyway.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Sim/Hardware.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm
index 41d21326..9bc753dd 100644
--- a/src/PVE/HA/Sim/Hardware.pm
+++ b/src/PVE/HA/Sim/Hardware.pm
@@ -488,6 +488,10 @@ sub new {
 
     if (-f "$testdir/static_service_stats") {
         copy("$testdir/static_service_stats", "$statusdir/static_service_stats");
+    } else {
+        my $services = $self->read_service_config();
+        my $stats = { map { $_ => { maxcpu => 4, maxmem => 4096 } } keys %$services };
+        $self->write_static_service_stats($stats);
     }
 
     my $cstatus = $self->read_hardware_status_nolock();
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH ha-manager 4/7] sim: hardware: fix ha resource existence check in set_static_service_stats

[Daniel Kral]

Otherwise this prevents a HA resource to be created, e.g. through the
pve-ha-simulator, as the static service stats for new HA resources is
set with this method.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Sim/Hardware.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm
index 9bc753dd..a1381b78 100644
--- a/src/PVE/HA/Sim/Hardware.pm
+++ b/src/PVE/HA/Sim/Hardware.pm
@@ -181,8 +181,10 @@ sub set_service_state {
 sub set_static_service_stats {
     my ($self, $sid, $new_stats) = @_;
 
+    my $conf = $self->read_service_config();
+    die "no such service '$sid'" if !$conf->{$sid};
+
     my $stats = $self->read_static_service_stats();
-    die "no such service '$sid'" if !$stats->{$sid};
 
     if (my $memory = $new_stats->{maxmem}) {
         print "setting $sid memory to $memory\n" if $memory != $stats->{$sid}->{maxmem};
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH ha-manager 5/7] sim: hardware: do not print stat changes in set_static_service_stats

[Daniel Kral]

Using the command is already enough to document the changes and printing
to stdout will not document these changes anyway. Also will throw a
uninitialized value comparison warning for new HA resources, which do
not have any static service stat value set.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Sim/Hardware.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm
index a1381b78..baee2018 100644
--- a/src/PVE/HA/Sim/Hardware.pm
+++ b/src/PVE/HA/Sim/Hardware.pm
@@ -187,12 +187,10 @@ sub set_static_service_stats {
     my $stats = $self->read_static_service_stats();
 
     if (my $memory = $new_stats->{maxmem}) {
-        print "setting $sid memory to $memory\n" if $memory != $stats->{$sid}->{maxmem};
         $stats->{$sid}->{maxmem} = $memory;
     }
 
     if (my $cpu = $new_stats->{maxcpu}) {
-        print "setting $sid memory to $cpu\n" if $cpu != $stats->{$sid}->{maxcpu};
         $stats->{$sid}->{maxcpu} = $cpu;
     }
 
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH ha-manager 6/7] sim: hardware: delete static service stats on service deletion

[Daniel Kral]

Since static service stats can now be set through `service <sid>
set-static-stats <newcpu> <newmem>` at runtime in the simulated
environment, make sure that static service stats are invalidated on HA
resource deletion, e.g. with the `service <sid> delete` command.

pve-ha-simulator does already call set-static-stats on every new HA
resource creation, but other future callers might not and run into
unexpected situations.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Sim/Hardware.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm
index baee2018..0848d18a 100644
--- a/src/PVE/HA/Sim/Hardware.pm
+++ b/src/PVE/HA/Sim/Hardware.pm
@@ -226,6 +226,12 @@ sub delete_service {
 
     $self->write_service_config($conf);
 
+    my $stats = $self->read_static_service_stats();
+
+    delete $stats->{$sid};
+
+    $self->write_static_service_stats($stats);
+
     return $conf;
 }
 
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH ha-manager 7/7] d/rules: add new PVE dependencies from PVE::Tools to pve-ha-simulator

[Daniel Kral]

As some of PVE::Tools is being split up into PVE::File and PVE::UPID,
these dependencies must be copied to the standalone pve-ha-simulator
package as well.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 debian/rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/rules b/debian/rules
index a7a3f6c0..1aa4b31d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,14 @@ override_dh_install:
 	install -d -m 0755 debian/tmp/usr/share/pve-ha-simulator/PVE
 	install -m 0644 \
 		/usr/share/perl5/PVE/Exception.pm \
+		/usr/share/perl5/PVE/File.pm \
 		/usr/share/perl5/PVE/JSONSchema.pm \
 		/usr/share/perl5/PVE/ProcFSTools.pm \
 		/usr/share/perl5/PVE/SafeSyslog.pm \
 		/usr/share/perl5/PVE/SectionConfig.pm \
 		/usr/share/perl5/PVE/Syscall.pm \
 		/usr/share/perl5/PVE/Tools.pm \
+		/usr/share/perl5/PVE/UPID.pm \
 		debian/tmp/usr/share/pve-ha-simulator/PVE/
 	dh_install
 
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH ha-manager 0/7] Some pve-ha-simulator fixups

[Thomas Lamprecht]

On Mon, 17 Nov 2025 18:20:59 +0100, Daniel Kral wrote:
> These are a few patches to fix some things that popped up with the
> recent changes for the pve-ha-simulator.
> 
> PATCH 1         smaller cleanup
> PATCH 2-4       fix r/w, add default fallback, fix creating new HA
>                 resources in pve-ha-simulator with static service stats
> PATCH 5         remove static_service_stats print statements
> PATCH 6         delete static_service_stats on service deletion
> PATCH 7         fix pve-ha-simulator being runnable on non-PVE envs
> 
> [...]

Applied, thanks!

[1/7] sim: hardware: remove service default groups
      commit: 922db5f4694fd226141acb432dd49272a76c250e
[2/7] sim: fix read and write to static service stats' maxmem
      commit: 318acad69cabba76aa5f67f43dbbdd32235fbfd6
[3/7] sim: hardware: initialize default fallback static_service_stats
      commit: 7934c9deafebf0e1e959dfcf40497ddbf87429e9
[4/7] sim: hardware: fix ha resource existence check in set_static_service_stats
      commit: 527134cfe361218edcc21ce0d8e661f7b4e6597e
[5/7] sim: hardware: do not print stat changes in set_static_service_stats
      commit: 82877c9bdeee3bf53040259dfbc00fcca5cf9610
[6/7] sim: hardware: delete static service stats on service deletion
      commit: d2abf4df55f869d611ab7c154022d4eaa6618231
[7/7] d/rules: add new PVE dependencies from PVE::Tools to pve-ha-simulator
      commit: d83dc84283cd4e0055ac6462f227c0e67a855317


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel