From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E3F551FF185 for ; Mon, 17 Nov 2025 18:22:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 263F0FED; Mon, 17 Nov 2025 18:22:25 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Mon, 17 Nov 2025 18:21:01 +0100 Message-ID: <20251117172147.533969-3-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251117172147.533969-1-d.kral@proxmox.com> References: <20251117172147.533969-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763400081333 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rthardware.pm, hardware.pm] Subject: [pve-devel] [PATCH ha-manager 2/7] sim: fix read and write to static service stats' maxmem X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Daniel Kral --- 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 stop # service lock/unlock [lockname] # service add [] [] -# service set-static-stats +# service set-static-stats # service 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