[pve-devel] [PATCH v2 pve-manager 04/10] ceph: services: refactor version existence check as guard clause

[Max Carrara]

Signed-off-by: Max Carrara <m.carr...@proxmox.com>
Tested-by: Lukas Wagner <l.wag...@proxmox.com>
Reviewed-by: Lukas Wagner <l.wag...@proxmox.com>
---
Changes v1 --> v2:
  * none

 PVE/Ceph/Services.pm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/PVE/Ceph/Services.pm b/PVE/Ceph/Services.pm
index f5109655..0b8c207e 100644
--- a/PVE/Ceph/Services.pm
+++ b/PVE/Ceph/Services.pm
@@ -50,26 +50,26 @@ sub broadcast_ceph_services {
 sub broadcast_ceph_versions {
     my ($version, $buildcommit, $vers_parts) = 
PVE::Ceph::Tools::get_local_version(1);
 
-    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
-           }
+    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 = {
-           version => {
-               str => $version,
-               parts => $vers_parts,
-           },
-           buildcommit => $buildcommit,
-       };
-       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 {
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel