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 C4E8AA2D40 for ; Tue, 20 Jun 2023 17:01:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A9E6F37620 for ; Tue, 20 Jun 2023 17:00:53 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 20 Jun 2023 17:00:53 +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 C48CE41D0C for ; Tue, 20 Jun 2023 17:00:52 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 20 Jun 2023 17:00:49 +0200 Message-Id: <20230620150050.184347-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, systemd.pm] Subject: [pve-devel] [PATCH common] systemd: add helper to cleanup transient unit 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: Tue, 20 Jun 2023 15:01:23 -0000 which combines the stop+wait logic previously present at the single call site of wait_for_unit_removed() in QemuServer.pm. It also does a reset-failed call first, to ensure a unit in a failed state is also cleaned up properly. Signed-off-by: Fiona Ebner --- src/PVE/Systemd.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/PVE/Systemd.pm b/src/PVE/Systemd.pm index 2517d31..327106f 100644 --- a/src/PVE/Systemd.pm +++ b/src/PVE/Systemd.pm @@ -7,7 +7,7 @@ use Net::DBus qw(dbus_uint32 dbus_uint64 dbus_boolean); use Net::DBus::Callback; use Net::DBus::Reactor; -use PVE::Tools qw(file_set_contents file_get_contents trim); +use PVE::Tools qw(file_set_contents file_get_contents run_command trim); sub escape_unit { my ($val, $is_path) = @_; @@ -167,6 +167,20 @@ sub wait_for_unit_removed($;$) { }, $timeout); } +sub cleanup_transient_unit($;$) { + my ($unit, $timeout) = @_; + + eval { + my %param = ( outfunc => sub {}, errfunc => sub {} ); + # If the unit is in a failed state (e.g. after being OOM-killed), stopping is not enough. + run_command(['/bin/systemctl', 'reset-failed', $unit], %param); + run_command(['/bin/systemctl', 'stop', $unit], %param); + }; + + # Issues with the above not being fully completed are rare, but not impossible, see bug #3733. + wait_for_unit_removed($unit, $timeout); +} + sub read_ini { my ($filename) = @_; -- 2.39.2