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 EB21CB4B7 for ; Fri, 30 Jun 2023 13:49:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C70E723336 for ; Fri, 30 Jun 2023 13:49:27 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 30 Jun 2023 13:49:26 +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 50E4742A0E for ; Fri, 30 Jun 2023 13:49:26 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 30 Jun 2023 13:49:20 +0200 Message-Id: <20230630114923.65506-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 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 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. [pvecm.pm, setup.pm] Subject: [pve-devel] [PATCH v2 cluster 1/4] setup: split generation of local (i.e. non-pmxcfs) files out into helper 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: Fri, 30 Jun 2023 11:49:58 -0000 In preparation to wait for quorum in the updatecerts command. The generation of files that do not depend on quorum should still be done beforehand. Signed-off-by: Fiona Ebner --- New in v2. src/PVE/CLI/pvecm.pm | 1 + src/PVE/Cluster/Setup.pm | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/PVE/CLI/pvecm.pm b/src/PVE/CLI/pvecm.pm index 564dc99..ebc15bd 100755 --- a/src/PVE/CLI/pvecm.pm +++ b/src/PVE/CLI/pvecm.pm @@ -576,6 +576,7 @@ __PACKAGE__->register_method ({ # IO (on /etc/pve) which can hang (uninterruptedly D state). That'd be # no-good for ExecStartPre as it fails the whole service in this case PVE::Tools::run_fork_with_timeout(30, sub { + PVE::Cluster::Setup::generate_local_files(); PVE::Cluster::Setup::updatecerts_and_ssh($param->@{qw(force silent)}); PVE::Cluster::prepare_observed_file_basedirs(); }); diff --git a/src/PVE/Cluster/Setup.pm b/src/PVE/Cluster/Setup.pm index 108817e..f6b491c 100644 --- a/src/PVE/Cluster/Setup.pm +++ b/src/PVE/Cluster/Setup.pm @@ -786,6 +786,7 @@ sub finish_join { } print "OK\n" if !$printqmsg; + generate_local_files(); updatecerts_and_ssh(1); print "generated new node certificate, restart pveproxy and pvedaemon services\n"; @@ -794,15 +795,16 @@ sub finish_join { print "successfully added node '$nodename' to cluster.\n"; } +sub generate_local_files { + setup_rootsshconfig(); + gen_pve_vzdump_symlink(); +} + sub updatecerts_and_ssh { my ($force_new_cert, $silent) = @_; my $p = sub { print "$_[0]\n" if !$silent }; - setup_rootsshconfig(); - - gen_pve_vzdump_symlink(); - if (!PVE::Cluster::check_cfs_quorum(1)) { return undef if $silent; die "no quorum - unable to update files\n"; -- 2.39.2