[pve-devel] [PATCH v2 cluster 1/4] setup: split generation of local (i.e. non-pmxcfs) files out into helper

[Fiona Ebner]

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 at 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