From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 cluster 1/4] setup: split generation of local (i.e. non-pmxcfs) files out into helper
Date: Fri, 30 Jun 2023 13:49:20 +0200 [thread overview]
Message-ID: <20230630114923.65506-1-f.ebner@proxmox.com> (raw)
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 <f.ebner@proxmox.com>
---
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
next reply other threads:[~2023-06-30 11:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 11:49 Fiona Ebner [this message]
2023-06-30 11:49 ` [pve-devel] [PATCH v2 cluster 2/4] pvecm: updatecerts: allow specifying time to wait for quorum via CLI argument Fiona Ebner
2023-06-30 11:55 ` Fiona Ebner
2023-06-30 11:49 ` [pve-devel] [PATCH v2 cluster 3/4] pvecm: updatecerts: silence warning that potentially has no context Fiona Ebner
2023-06-30 11:49 ` [pve-devel] [PATCH v2 cluster 4/4] fix typo Fiona Ebner
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=20230630114923.65506-1-f.ebner@proxmox.com \
--to=f.ebner@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