From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 6E2A820EC91 for ; Tue, 30 Apr 2024 17:29:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 17CB64E4; Tue, 30 Apr 2024 17:29:40 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Tue, 30 Apr 2024 17:28:53 +0200 Message-Id: <20240430152857.659326-5-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240430152857.659326-1-m.carrara@proxmox.com> References: <20240430152857.659326-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v1 pve-manager 4/8] ceph: services: refactor version existence check as guard clause X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Max Carrara --- 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