From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8B61268A5C for ; Thu, 10 Mar 2022 08:50:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7C6D57943 for ; Thu, 10 Mar 2022 08:50:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 017707934 for ; Thu, 10 Mar 2022 08:50:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C8A394583A for ; Thu, 10 Mar 2022 08:50:14 +0100 (CET) Message-ID: <49319235-0c70-8706-4d77-239e73eacc0a@proxmox.com> Date: Thu, 10 Mar 2022 08:50:13 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20211130103812.58366-1-f.ebner@proxmox.com> From: Fabian Ebner In-Reply-To: <20211130103812.58366-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.122 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [services.pm] Subject: Re: [pve-devel] [PATCH manager] ceph: services: broadcast versions: improve requesting old version 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: , X-List-Received-Date: Thu, 10 Mar 2022 07:50:45 -0000 Ping Am 30.11.21 um 11:38 schrieb Fabian Ebner: > to avoid a "malformed JSON string" warning when there is no old > version present (e.g. after starting a cluster). > > get_node_kv will always return something that evaluates to true, so > instead, test if the result has an entry for the current node. Also, > it's enough to request the kv for the current node only. > > Signed-off-by: Fabian Ebner > --- > PVE/Ceph/Services.pm | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/PVE/Ceph/Services.pm b/PVE/Ceph/Services.pm > index cda13c6a..e0f31e8e 100644 > --- a/PVE/Ceph/Services.pm > +++ b/PVE/Ceph/Services.pm > @@ -51,8 +51,9 @@ sub broadcast_ceph_versions { > my ($version, $buildcommit, $vers_parts) = PVE::Ceph::Tools::get_local_version(1); > > if ($version) { > - if (my $old = PVE::Cluster::get_node_kv("ceph-versions")) { > - my $nodename = PVE::INotify::nodename(); > + 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) {