in case a nodes runs a non-x86 kernel, broadcast that info into the 'static-info' hash to pmxcfs (once). Use that info to add an 'architecture' property to /cluster/resources.
x86 nodes won't return a value here. Signed-off-by: Dominik Csapak <[email protected]> --- changes from v2: * use Tools get_host_arch instead of POSIX::uname() * fix adding the arch only when it's non-x86 * rename variable and api property to 'host-arch' sending only the api patch for a v3 for now just to note, the only ui adaptations for this needed are in [05/17] ui: qemu: add architecture specific defaults and helpers namely the two occurences of: PVE.data.ResourceStore.getNodeById(nodename)?.data.architecture; need a change to PVE.data.ResourceStore.getNodeById(nodename)?.data['host-arch']; PVE/API2/Cluster.pm | 9 +++++++++ PVE/Service/pvestatd.pm | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm index d6003a7d..2ee988e0 100644 --- a/PVE/API2/Cluster.pm +++ b/PVE/API2/Cluster.pm @@ -484,6 +484,12 @@ __PACKAGE__->register_method({ type => "string", optional => 1, }, + 'host-arch' => { + description => "The nodes CPU architecture. (for type 'node').", + type => 'string', + default => 'x86_64', + optional => 1, + }, }, }, }, @@ -608,6 +614,9 @@ __PACKAGE__->register_method({ if (defined(my $mode = $info->{'cgroup-mode'})) { $entry->{'cgroup-mode'} = int($mode); } + if (defined(my $host_arch = $info->{'host-arch'})) { + $entry->{'host-arch'} = $host_arch; + } if (defined(my $status = $hastatus->{node_status}->{$node})) { $entry->{'hastate'} = $status; } diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm index 98d421f4..2caecce9 100755 --- a/PVE/Service/pvestatd.pm +++ b/PVE/Service/pvestatd.pm @@ -138,6 +138,8 @@ my sub broadcast_static_node_info { my $cgroup_mode = eval { PVE::CGroup::cgroup_mode(); }; syslog('err', "cgroup mode error: $@") if $@; + my $host_arch = PVE::Tools::get_host_arch(); + my $old = PVE::Cluster::get_node_kv('static-info', $nodename); $old = eval { decode_json($old->{$nodename}) } if defined($old->{$nodename}); @@ -147,11 +149,18 @@ my sub broadcast_static_node_info { || !defined($old->{memory}) || $old->{memory} != $memory || ($old->{'cgroup-mode'} // -1) != ($cgroup_mode // -1) + || (defined($host_arch) + && $host_arch ne 'x86_64' + && (!defined($old->{'host-arch'}) || $old->{'host-arch'} ne $host_arch)) ) { my $info = { cpus => $cpus, memory => $memory, }; + + # only save architecture info for non-x86 ones + $info->{'host-arch'} = $host_arch if defined($host_arch) && $host_arch ne 'x86_64'; + $info->{'cgroup-mode'} = $cgroup_mode if defined($cgroup_mode); PVE::Cluster::broadcast_node_kv('static-info', encode_json($info)); } -- 2.47.3
