The names `maxcpu` and `maxmem` are used in the static load scheduler itself and is more telling that these properties provide the maximum configured amount of CPU cores and memory.
Signed-off-by: Daniel Kral <[email protected]> --- src/PVE/HA/Env/PVE2.pm | 9 ++++++++- src/PVE/HA/Sim/Hardware.pm | 8 ++++---- src/PVE/HA/Usage/Static.pm | 6 +++--- .../hardware_status | 6 +++--- .../hardware_status | 6 +++--- .../hardware_status | 10 +++++----- src/test/test-crs-static-rebalance1/hardware_status | 6 +++--- src/test/test-crs-static-rebalance2/hardware_status | 6 +++--- src/test/test-crs-static1/hardware_status | 6 +++--- src/test/test-crs-static2/hardware_status | 10 +++++----- src/test/test-crs-static3/hardware_status | 6 +++--- src/test/test-crs-static4/hardware_status | 6 +++--- src/test/test-crs-static5/hardware_status | 6 +++--- 13 files changed, 49 insertions(+), 42 deletions(-) diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 37720f72..ee4fa23d 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -543,7 +543,14 @@ sub get_static_node_stats { my $stats = PVE::Cluster::get_node_kv('static-info'); for my $node (keys $stats->%*) { - $stats->{$node} = eval { decode_json($stats->{$node}) }; + $stats->{$node} = eval { + my $node_stats = decode_json($stats->{$node}); + + return { + maxcpu => $node_stats->{cpus}, + maxmem => $node_stats->{memory}, + }; + }; $self->log('err', "unable to decode static node info for '$node' - $@") if $@; } diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index 97ada580..702500c2 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -488,9 +488,9 @@ sub new { || die "Copy failed: $!\n"; } else { my $cstatus = { - node1 => { power => 'off', network => 'off', cpus => 24, memory => 131072 }, - node2 => { power => 'off', network => 'off', cpus => 24, memory => 131072 }, - node3 => { power => 'off', network => 'off', cpus => 24, memory => 131072 }, + node1 => { power => 'off', network => 'off', maxcpu => 24, maxmem => 131072 }, + node2 => { power => 'off', network => 'off', maxcpu => 24, maxmem => 131072 }, + node3 => { power => 'off', network => 'off', maxcpu => 24, maxmem => 131072 }, }; $self->write_hardware_status_nolock($cstatus); } @@ -1088,7 +1088,7 @@ sub get_static_node_stats { my $stats = {}; for my $node (keys $cstatus->%*) { - $stats->{$node} = { $cstatus->{$node}->%{qw(cpus memory)} }; + $stats->{$node} = { $cstatus->{$node}->%{qw(maxcpu maxmem)} }; } return $stats; diff --git a/src/PVE/HA/Usage/Static.pm b/src/PVE/HA/Usage/Static.pm index d586b603..395be871 100644 --- a/src/PVE/HA/Usage/Static.pm +++ b/src/PVE/HA/Usage/Static.pm @@ -33,10 +33,10 @@ sub add_node { my $stats = $self->{'node-stats'}->{$nodename} or die "did not get static node usage information for '$nodename'\n"; - die "static node usage information for '$nodename' missing cpu count\n" if !$stats->{cpus}; - die "static node usage information for '$nodename' missing memory\n" if !$stats->{memory}; + die "static node usage information for '$nodename' missing cpu count\n" if !$stats->{maxcpu}; + die "static node usage information for '$nodename' missing memory\n" if !$stats->{maxmem}; - eval { $self->{scheduler}->add_node($nodename, int($stats->{cpus}), int($stats->{memory})); }; + eval { $self->{scheduler}->add_node($nodename, int($stats->{maxcpu}), int($stats->{maxmem})); }; die "initializing static node usage for '$nodename' failed - $@" if $@; } diff --git a/src/test/test-crs-static-rebalance-resource-affinity1/hardware_status b/src/test/test-crs-static-rebalance-resource-affinity1/hardware_status index 84484af1..3d4cf91f 100644 --- a/src/test/test-crs-static-rebalance-resource-affinity1/hardware_status +++ b/src/test/test-crs-static-rebalance-resource-affinity1/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 8, "memory": 112000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 8, "memory": 112000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 8, "memory": 112000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 112000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 112000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 112000000000 } } diff --git a/src/test/test-crs-static-rebalance-resource-affinity2/hardware_status b/src/test/test-crs-static-rebalance-resource-affinity2/hardware_status index 84484af1..3d4cf91f 100644 --- a/src/test/test-crs-static-rebalance-resource-affinity2/hardware_status +++ b/src/test/test-crs-static-rebalance-resource-affinity2/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 8, "memory": 112000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 8, "memory": 112000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 8, "memory": 112000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 112000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 112000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 112000000000 } } diff --git a/src/test/test-crs-static-rebalance-resource-affinity3/hardware_status b/src/test/test-crs-static-rebalance-resource-affinity3/hardware_status index b6dcb1a5..7bc741f1 100644 --- a/src/test/test-crs-static-rebalance-resource-affinity3/hardware_status +++ b/src/test/test-crs-static-rebalance-resource-affinity3/hardware_status @@ -1,7 +1,7 @@ { - "node1": { "power": "off", "network": "off", "cpus": 8, "memory": 48000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 32, "memory": 36000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 16, "memory": 24000000000 }, - "node4": { "power": "off", "network": "off", "cpus": 32, "memory": 36000000000 }, - "node5": { "power": "off", "network": "off", "cpus": 8, "memory": 48000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 48000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 36000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 16, "maxmem": 24000000000 }, + "node4": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 36000000000 }, + "node5": { "power": "off", "network": "off", "maxcpu": 8, "maxmem": 48000000000 } } diff --git a/src/test/test-crs-static-rebalance1/hardware_status b/src/test/test-crs-static-rebalance1/hardware_status index 651ad792..bfdbbf7b 100644 --- a/src/test/test-crs-static-rebalance1/hardware_status +++ b/src/test/test-crs-static-rebalance1/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 32, "memory": 256000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 32, "memory": 256000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 32, "memory": 256000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 256000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 256000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 256000000000 } } diff --git a/src/test/test-crs-static-rebalance2/hardware_status b/src/test/test-crs-static-rebalance2/hardware_status index 9be70a40..c5cbde3d 100644 --- a/src/test/test-crs-static-rebalance2/hardware_status +++ b/src/test/test-crs-static-rebalance2/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 40, "memory": 384000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 32, "memory": 256000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 32, "memory": 256000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 40, "maxmem": 384000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 256000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 256000000000 } } diff --git a/src/test/test-crs-static1/hardware_status b/src/test/test-crs-static1/hardware_status index 0fa8c265..bbe44a96 100644 --- a/src/test/test-crs-static1/hardware_status +++ b/src/test/test-crs-static1/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 32, "memory": 200000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 32, "memory": 300000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 200000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 300000000000 } } diff --git a/src/test/test-crs-static2/hardware_status b/src/test/test-crs-static2/hardware_status index d426023a..815436ef 100644 --- a/src/test/test-crs-static2/hardware_status +++ b/src/test/test-crs-static2/hardware_status @@ -1,7 +1,7 @@ { - "node1": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 32, "memory": 200000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 32, "memory": 300000000000 }, - "node4": { "power": "off", "network": "off", "cpus": 64, "memory": 300000000000 }, - "node5": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 200000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 300000000000 }, + "node4": { "power": "off", "network": "off", "maxcpu": 64, "maxmem": 300000000000 }, + "node5": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 } } diff --git a/src/test/test-crs-static3/hardware_status b/src/test/test-crs-static3/hardware_status index dfbf496e..ed84b8bd 100644 --- a/src/test/test-crs-static3/hardware_status +++ b/src/test/test-crs-static3/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 64, "memory": 200000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 64, "maxmem": 200000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 } } diff --git a/src/test/test-crs-static4/hardware_status b/src/test/test-crs-static4/hardware_status index a83a2dcc..b08ba7f9 100644 --- a/src/test/test-crs-static4/hardware_status +++ b/src/test/test-crs-static4/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 } } diff --git a/src/test/test-crs-static5/hardware_status b/src/test/test-crs-static5/hardware_status index 3eb9e735..edfd6db2 100644 --- a/src/test/test-crs-static5/hardware_status +++ b/src/test/test-crs-static5/hardware_status @@ -1,5 +1,5 @@ { - "node1": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 }, - "node2": { "power": "off", "network": "off", "cpus": 32, "memory": 100000000000 }, - "node3": { "power": "off", "network": "off", "cpus": 128, "memory": 100000000000 } + "node1": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 }, + "node2": { "power": "off", "network": "off", "maxcpu": 32, "maxmem": 100000000000 }, + "node3": { "power": "off", "network": "off", "maxcpu": 128, "maxmem": 100000000000 } } -- 2.47.3
