From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5112771226 for ; Fri, 1 Oct 2021 16:06:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 44A072C82B for ; Fri, 1 Oct 2021 16:06:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 269F12C820 for ; Fri, 1 Oct 2021 16:06:12 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E8749453CE for ; Fri, 1 Oct 2021 16:06:11 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 1 Oct 2021 16:06:11 +0200 Message-Id: <20211001140611.3467172-1-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211001135934.3429632-1-a.lauterer@proxmox.com> References: <20211001135934.3429632-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.238 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 manager] ceph install: improve ceph install checks during installation X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 14:06:13 -0000 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 --- 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