[pve-devel] [PATCH v2 manager] ceph install: improve ceph install checks during installation

Aaron Lauterer a.lauterer at proxmox.com
Fri Oct 1 16:06:11 CEST 2021


Adding a lock file during the Ceph installation helps to cover the time
span in which the binary is already present but the installation not yet
done.

The most noticeable effect is that the 'Next' button in the GUI will
only become active once the installation is actually finished and not
earlier.

Signed-off-by: Aaron Lauterer <a.lauterer at proxmox.com>
---

checking if the file exists should be better done with -f than with -e
to check for plain files only.

 PVE/CLI/pveceph.pm | 9 +++++++++
 PVE/Ceph/Tools.pm  | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index 356af282..3bee3413 100755
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -177,7 +177,14 @@ __PACKAGE__->register_method ({
 	);
 
 	print "start installation\n";
+
+	my $install_lock_file = '/var/lock/ceph_install.lck';
+	open(INSTALL_LOCK, ">${install_lock_file}") ||
+	     die "could not lock Ceph installation\n";
+	close INSTALL_LOCK;
+
 	if (system(@apt_install, @ceph_packages) != 0) {
+	    unlink $install_lock_file;
 	    die "apt failed during ceph installation ($?)\n";
 	}
 
@@ -188,6 +195,8 @@ __PACKAGE__->register_method ({
 	    'systemctl', 'try-reload-or-restart', 'pvedaemon.service', 'pveproxy.service'
 	]);
 
+	unlink $install_lock_file;
+
 	return undef;
     }});
 
diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm
index f54d837a..c09dd778 100644
--- a/PVE/Ceph/Tools.pm
+++ b/PVE/Ceph/Tools.pm
@@ -155,7 +155,9 @@ sub check_ceph_installed {
 
     $service = 'ceph_bin' if !defined($service);
 
-    if (! -x $ceph_service->{$service}) {
+    # ceph_install.lck is checked to cover the time where the binary is already
+    # present, but the installation not yet done
+    if (! -x $ceph_service->{$service} || -f '/var/lock/ceph_install.lck') {
 	die "binary not installed: $ceph_service->{$service}\n" if !$noerr;
 	return undef;
     }
-- 
2.30.2





More information about the pve-devel mailing list