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

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

[Aaron Lauterer]

Adding a flag 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@proxmox.com>
---

v2 -> v3 (thanks for the hints):
 - calling it a flag and moving it to /run
 - improve file opening / unlinking handling and showing errors
 - adding more / improving comments

v1 -> v3: check for plain file and not just existing file

If the flag file is created before ceph is installed, there is no
effect. If it is created after Ceph has been installed, the user is
prompted by the install dialog once more, but apt will be done right
away.

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

diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index 356af282..6d77f6ad 100755
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -177,7 +177,16 @@ __PACKAGE__->register_method ({
 	);
 
 	print "start installation\n";
+
+	# the install flag helps to determine when apt is done installing
+	my $install_flag_file = '/run/ceph-install-flag';
+	open(my $install_flag, '>', "${install_flag_file}") or
+	     die "could not open Ceph installation flag - $!\n";
+	close $install_flag;
+
 	if (system(@apt_install, @ceph_packages) != 0) {
+	    unlink $install_flag_file or
+		warn "Could not remove Ceph installation flag - $!";
 	    die "apt failed during ceph installation ($?)\n";
 	}
 
@@ -188,6 +197,9 @@ __PACKAGE__->register_method ({
 	    'systemctl', 'try-reload-or-restart', 'pvedaemon.service', 'pveproxy.service'
 	]);
 
+	unlink $install_flag_file or
+	    warn "Could not remove Ceph installation flag - $!";
+
 	return undef;
     }});
 
diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm
index f54d837a..3f0818fd 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}) {
+    # the flag file is checked as on a new installation, the binary gets
+    # extracted by dpkg before the installation is finished
+    if (! -x $ceph_service->{$service} || -f '/run/ceph-install-flag') {
 	die "binary not installed: $ceph_service->{$service}\n" if !$noerr;
 	return undef;
     }
-- 
2.30.2

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

[Thomas Lamprecht]

On 04.10.21 10:02, Aaron Lauterer wrote:
> Adding a flag 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@proxmox.com>
> ---
> 
> v2 -> v3 (thanks for the hints):
>  - calling it a flag and moving it to /run
>  - improve file opening / unlinking handling and showing errors
>  - adding more / improving comments
> 
> v1 -> v3: check for plain file and not just existing file
> 
> If the flag file is created before ceph is installed, there is no
> effect. If it is created after Ceph has been installed, the user is
> prompted by the install dialog once more, but apt will be done right
> away.
> 
>  PVE/CLI/pveceph.pm | 12 ++++++++++++
>  PVE/Ceph/Tools.pm  |  4 +++-
>  2 files changed, 15 insertions(+), 1 deletion(-)
> 
>

applied, thanks! I moved the actual file name into a helper method located in
PVE::Ceph::Tools so that there's only a single source of truth for it.
Plus some minor style nits.