Proxmox/pve-ha-manager
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-ha-manager.git synced 2025-01-03 05:17:57 +03:00
Code Releases Activity

resources: pve: avoid relying on internal configuration details

Browse Source 
Instead, use the new get_derived_property() method to get the same
information in a way that is robust regarding changes in the
configuration structure.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2023-02-28 11:54:10 +01:00 committed by Thomas Lamprecht
parent afa1aa9cb8
commit e0346eccaf
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PVE/HA/Resources/PVECT.pm
View File

@ -158,8 +158,8 @@ sub get_static_stats {
my $conf = PVE::LXC::Config->load_config($id, $service_node);
return {
maxcpu => $conf->{cpulimit} || $conf->{cores} || 0,
maxmem => ($conf->{memory} || 512) * 1024 * 1024,
maxcpu => PVE::LXC::Config->get_derived_property($conf, 'max-cpu'),
maxmem => PVE::LXC::Config->get_derived_property($conf, 'max-memory'),
};
}

7
src/PVE/HA/Resources/PVEVM.pm
View File

@ -179,13 +179,10 @@ sub get_static_stats {
my ($class, $haenv, $id, $service_node) = @_;
my $conf = PVE::QemuConfig->load_config($id, $service_node);
my $defaults = PVE::QemuServer::load_defaults();
my $cpus = ($conf->{sockets} || $defaults->{sockets}) * ($conf->{cores} || $defaults->{cores});
return {
maxcpu => $conf->{vcpus} || $cpus,
maxmem => ($conf->{memory} || $defaults->{memory}) * 1024 * 1024,
maxcpu => PVE::QemuConfig->get_derived_property($conf, 'max-cpu'),
maxmem => PVE::QemuConfig->get_derived_property($conf, 'max-memory'),
};
}