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

[Daniel Kral <d.kral@proxmox.com>]

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