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 D53857364F for ; Tue, 6 Jul 2021 14:13:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C4DF5A0AA for ; Tue, 6 Jul 2021 14:13:58 +0200 (CEST) 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 A9968A09D for ; Tue, 6 Jul 2021 14:13:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 811CA40E41 for ; Tue, 6 Jul 2021 14:13:57 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 6 Jul 2021 14:13:44 +0200 Message-Id: <20210706121348.3505015-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706121348.3505015-1-f.gruenbichler@proxmox.com> References: <20210706121348.3505015-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.536 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pve6to7.pm] Subject: [pve-devel] [PATCH manager 1/5] pve6to7: use new flags API 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: Tue, 06 Jul 2021 12:13:58 -0000 the old one is not available post-upgrade, let's use a single codepath for this. the new API only allows querying user-settable flags, but the only flags we check besides 'noout' are not relevant for an upgrade of PVE 6.x to 7.x (PVE 6.x only supports Nautilus+ which requires these flags to be set in order to work) so we can just drop those outdated checks instead of extending/refactoring the API. Signed-off-by: Fabian Grünbichler --- PVE/CLI/pve6to7.pm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm index 60edac11..c693e0d4 100644 --- a/PVE/CLI/pve6to7.pm +++ b/PVE/CLI/pve6to7.pm @@ -8,6 +8,7 @@ use PVE::API2::Ceph; use PVE::API2::LXC; use PVE::API2::Qemu; use PVE::API2::Certificates; +use PVE::API2::Cluster::Ceph; use PVE::AccessControl; use PVE::Ceph::Tools; @@ -389,9 +390,12 @@ sub check_ceph { log_info("getting Ceph status/health information.."); my $ceph_status = eval { PVE::API2::Ceph->status({ node => $nodename }); }; - my $osd_flags = eval { PVE::API2::Ceph->get_flags({ node => $nodename }); }; + my $noout = eval { PVE::API2::Cluster::Ceph->get_flag({ flag => "noout" }); }; + if ($@) { + log_fail("failed to get 'noout' flag status - $@"); + } + my $noout_wanted = 1; - my $noout = $osd_flags && $osd_flags =~ m/noout/; if (!$ceph_status || !$ceph_status->{health}) { log_fail("unable to determine Ceph status!"); @@ -409,17 +413,6 @@ sub check_ceph { } } - log_info("getting Ceph OSD flags.."); - eval { - if (!$osd_flags) { - log_fail("unable to get Ceph OSD flags!"); - } else { - if (!($osd_flags =~ m/recovery_deletes/ && $osd_flags =~ m/purged_snapdirs/)) { - log_fail("missing 'recovery_deletes' and/or 'purged_snapdirs' flag, scrub of all PGs required before upgrading to Nautilus!"); - } - } - }; - # TODO: check OSD min-required version, if to low it breaks stuff! log_info("getting Ceph daemon versions.."); -- 2.30.2