From: Max Carrara <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Lukas Wagner <l.wagner@proxmox.com>
Subject: [pve-devel] [PATCH v2 pve-manager 04/10] ceph: services: refactor version existence check as guard clause
Date: Mon, 1 Jul 2024 16:10:34 +0200 [thread overview]
Message-ID: <20240701141040.643701-5-m.carrara@proxmox.com> (raw)
In-Reply-To: <20240701141040.643701-1-m.carrara@proxmox.com>
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>
---
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
next prev parent reply other threads:[~2024-07-01 14:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-01 14:10 [pve-devel] [PATCH v2 pve-manager 00/10] Ceph Build Commit in UI Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 01/10] ceph: tools: refactor installation check as guard clause Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 02/10] ceph: tools: parse Ceph version in separate sub and update regex Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 03/10] ceph: services: remove old cluster broadcast Max Carrara
2024-07-01 14:10 ` Max Carrara [this message]
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 05/10] utils: align regex of parse_ceph_version with Perl equivalent Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 06/10] ui: ceph: services: parse and display build commit Max Carrara
2024-07-22 15:38 ` Thomas Lamprecht
2024-07-23 6:49 ` Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 07/10] api: ceph: add build commit of host to Ceph osd index endpoint data Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 08/10] ui: ceph: osd: rework rendering of version field & show build commit Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 09/10] ui: ceph: osd: increase width of version column Max Carrara
2024-07-01 14:10 ` [pve-devel] [PATCH v2 pve-manager 10/10] api: ceph: change version format in OSD metadata endpoint Max Carrara
2024-07-02 14:17 ` [pve-devel] [PATCH v2 pve-manager 00/10] Ceph Build Commit in UI Max Carrara
2024-07-19 12:17 ` Igor Moritz Thaller
2024-07-22 5:29 ` Max Carrara
2024-07-22 15:40 ` [pve-devel] partially-applied-series: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240701141040.643701-5-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=l.wagner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox