konevsa/pve-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: services: refactor version existence check as guard clause

Browse Source 
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Igor Thaller <igor.thaller@brg9.at>
This commit is contained in:
Max Carrara 2024-07-01 16:10:34 +02:00 committed by Thomas Lamprecht
parent f09b26ae56
commit ddf6263191
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
PVE/Ceph/Services.pm
View File

@ -50,26 +50,26 @@ sub broadcast_ceph_services {
sub broadcast_ceph_versions { sub broadcast_ceph_versions {
my ($version, $buildcommit, $vers_parts) = PVE::Ceph::Tools::get_local_version(1); my ($version, $buildcommit, $vers_parts) = PVE::Ceph::Tools::get_local_version(1);
if ($version) { return undef if !$version;
my $nodename = PVE::INotify::nodename();
my $old = PVE::Cluster::get_node_kv("ceph-versions", $nodename);
if (defined($old->{$nodename})) {
$old = eval { decode_json($old->{$nodename}) };
warn $@ if $@; # should not happen
if (defined($old) && $old->{buildcommit} eq $buildcommit && $old->{version}->{str} eq $version) {
return; # up to date, nothing to do so avoid (not exactly cheap) broadcast
}
}
my $node_versions = { my $nodename = PVE::INotify::nodename();
version => { my $old = PVE::Cluster::get_node_kv("ceph-versions", $nodename);
str => $version, if (defined($old->{$nodename})) {
parts => $vers_parts, $old = eval { decode_json($old->{$nodename}) };
}, warn $@ if $@; # should not happen
buildcommit => $buildcommit, if (defined($old) && $old->{buildcommit} eq $buildcommit && $old->{version}->{str} eq $version) {
}; return; # up to date, nothing to do so avoid (not exactly cheap) broadcast
PVE::Cluster::broadcast_node_kv("ceph-versions", encode_json($node_versions)); }
} }
my $node_versions = {
version => {
str => $version,
parts => $vers_parts,
},
buildcommit => $buildcommit,
};
PVE::Cluster::broadcast_node_kv("ceph-versions", encode_json($node_versions));
} }
sub get_ceph_versions { sub get_ceph_versions {