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 35A0765DAD for ; Fri, 24 Jul 2020 15:26:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2C331B305 for ; Fri, 24 Jul 2020 15:25:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 66CF8B2F4 for ; Fri, 24 Jul 2020 15:25:34 +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 3144D43350 for ; Fri, 24 Jul 2020 15:25:34 +0200 (CEST) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Date: Fri, 24 Jul 2020 15:25:25 +0200 Message-Id: <20200724132527.3623835-1-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [services.pm] Subject: [pve-devel] applied: [PATCH manager 1/3] api/services: improve essential service check, allow reload and start 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, 24 Jul 2020 13:26:05 -0000 reload is actually preferred, and even if most of the time this even won't reach the API, allowing to start them is still definitively fine! Signed-off-by: Thomas Lamprecht --- PVE/API2/Services.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PVE/API2/Services.pm b/PVE/API2/Services.pm index a504dcd5..e5b3c3da 100644 --- a/PVE/API2/Services.pm +++ b/PVE/API2/Services.pm @@ -34,6 +34,11 @@ my $service_name_list = [ 'ksmtuned', 'systemd-timesyncd', ]; +my $essential_services = { + pveproxy => 1, + pvedaemon => 1, + 'pve-cluster' => 1, +}; # since postfix package 3.1.0-3.1 the postfix unit is only here to # manage subinstances, of which the default is called "-". @@ -92,17 +97,12 @@ my $service_cmd = sub { my $initd_cmd; - die "unknown service command '$cmd'\n" - if $cmd !~ m/^(start|stop|restart|reload)$/; + die "unknown service command '$cmd'\n" if $cmd !~ m/^(start|stop|restart|reload|try-reload-or-restart)$/; - if ($service eq 'pvecluster' || $service eq 'pvedaemon' || $service eq 'pveproxy') { - if ($cmd eq 'restart') { - # OK - } else { - die "invalid service cmd '$service $cmd': ERROR"; - } + if ($essential_services->{$service} && $cmd eq 'stop') { + die "invalid service cmd '$service $cmd': refusing to stop essential service!\n"; } - + PVE::Tools::run_command(['systemctl', $cmd, $service]); }; -- 2.20.1