proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-27 15:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ceph install: improve ceph install checks during installation

Browse Source 
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>
This commit is contained in:
Aaron Lauterer 2021-10-04 10:02:25 +02:00 committed by Thomas Lamprecht
parent a040ecafb7
commit 4dd27d5034
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/CLI/pveceph.pm
View File

@ -177,7 +177,16 @@ __PACKAGE__->register_method ({
); );
print "start installation\n"; 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) { 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"; die "apt failed during ceph installation ($?)\n";
} }
@ -188,6 +197,9 @@ __PACKAGE__->register_method ({
'systemctl', 'try-reload-or-restart', 'pvedaemon.service', 'pveproxy.service' 'systemctl', 'try-reload-or-restart', 'pvedaemon.service', 'pveproxy.service'
]); ]);
unlink $install_flag_file or
warn "Could not remove Ceph installation flag - $!";
return undef; return undef;
}}); }});

4
PVE/Ceph/Tools.pm
View File

@ -155,7 +155,9 @@ sub check_ceph_installed {
$service = 'ceph_bin' if !defined($service); $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; die "binary not installed: $ceph_service->{$service}\n" if !$noerr;
return undef; return undef;
} }