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 F192C1FF146 for ; Tue, 28 Apr 2026 04:46:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C25AB27E1; Tue, 28 Apr 2026 04:46:48 +0200 (CEST) From: Kefu Chai To: pve-devel@lists.proxmox.com Subject: [PATCH manager 5/5] ceph: drop duplicate release-to-codename map in upgrade checks Date: Tue, 28 Apr 2026 10:45:38 +0800 Message-ID: <20260428024538.3559017-6-k.chai@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260428024538.3559017-1-k.chai@proxmox.com> References: <20260428024538.3559017-1-k.chai@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777344261227 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.309 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 Message-ID-Hash: 6T74MW357NOH5TJFKJUIUOCK3UUP4QCA X-Message-ID-Hash: 6T74MW357NOH5TJFKJUIUOCK3UUP4QCA X-MailFrom: k.chai@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Drop the local $ceph_release2code map in PVE::Ceph::UpgradeCheck and look up codenames through PVE::Ceph::Releases::get_codename_for_major_release() instead. The map duplicated data already maintained in Releases.pm, so adding a new Ceph release would have required two updates. No functional change. Signed-off-by: Kefu Chai --- PVE/Ceph/UpgradeCheck.pm | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/PVE/Ceph/UpgradeCheck.pm b/PVE/Ceph/UpgradeCheck.pm index 09418df3..4103c136 100644 --- a/PVE/Ceph/UpgradeCheck.pm +++ b/PVE/Ceph/UpgradeCheck.pm @@ -17,20 +17,10 @@ use PVE::Ceph::Releases; use PVE::Ceph::Tools; use PVE::Cluster; -my $ceph_release2code = { - '12' => 'Luminous', - '13' => 'Mimic', - '14' => 'Nautilus', - '15' => 'Octopus', - '16' => 'Pacific', - '17' => 'Quincy', - '18' => 'Reef', - '19' => 'Squid', - '20' => 'Tentacle', -}; my $default_supported_release = 19; # available before and after the current major upgrade -my $default_supported_code_name = $ceph_release2code->{"$default_supported_release"} - or die "inconsistent source code, could not map expected ceph version to code name!"; +my $default_supported_code_name = + ucfirst(PVE::Ceph::Releases::get_codename_for_major_release($default_supported_release) + // die "inconsistent source code, could not map expected ceph version to code name!\n"); sub run_checks { my (%args) = @_; @@ -118,13 +108,18 @@ sub check_versions { my @out; my $noout_wanted = 1; - my $supported_code_name = $supported_release == $default_supported_release + my $supported_code_name = + $supported_release == $default_supported_release ? $default_supported_code_name - : ($ceph_release2code->{"$supported_release"} // 'unknown'); + : do { + my $codename = PVE::Ceph::Releases::get_codename_for_major_release($supported_release); + defined($codename) ? ucfirst($codename) : 'unknown'; + }; push @out, { level => 'info', msg => "checking local Ceph version.." }; if (my $release = eval { PVE::Ceph::Tools::get_local_version(1) }) { - my $code_name = $ceph_release2code->{"$release"} || 'unknown'; + my $codename = PVE::Ceph::Releases::get_codename_for_major_release($release); + my $code_name = defined($codename) ? ucfirst($codename) : 'unknown'; if ($release == $supported_release) { push @out, { -- 2.47.3