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 C859FA2D83 for ; Tue, 20 Jun 2023 17:00:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA7A037621 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 C927641E4E 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:50 +0200 Message-Id: <20230620150050.184347-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620150050.184347-1-f.ebner@proxmox.com> References: <20230620150050.184347-1-f.ebner@proxmox.com> 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. [shared.pm, qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server] vm start: switch to new cleanup_transient_unit systemd helper 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:00:53 -0000 which also runs a reset-failed command for the unit first, to ensure it is also cleaned up properly if in a failed state (e.g. after being OOM-killed). Previuosly, users in that situation would only see the less than ideal error message 'timeout waiting on systemd'. Signed-off-by: Fiona Ebner --- Dependency bump for libpve-common-perl needed. PVE/QemuServer.pm | 7 +------ test/MigrationTest/Shared.pm | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 940cdacd..34d9b0b1 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5871,12 +5871,7 @@ sub vm_start_nolock { PVE::Storage::activate_volumes($storecfg, $vollist); - eval { - run_command(['/bin/systemctl', 'stop', "$vmid.scope"], outfunc => sub{}, errfunc => sub{}); - }; - # Issues with the above 'stop' not being fully completed are extremely rare, a very low - # timeout should be more than enough here... - PVE::Systemd::wait_for_unit_removed("$vmid.scope", 20); + PVE::Systemd::cleanup_transient_unit("$vmid.scope", 20); my $cpuunits = PVE::CGroup::clamp_cpu_shares($conf->{cpuunits}); diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm index aa7203d1..44624f7f 100644 --- a/test/MigrationTest/Shared.pm +++ b/test/MigrationTest/Shared.pm @@ -191,7 +191,7 @@ $storage_plugin_module->mock( our $systemd_module = Test::MockModule->new("PVE::Systemd"); $systemd_module->mock( - wait_for_unit_removed => sub { + cleanup_transient_unit => sub { return; }, enter_systemd_scope => sub { -- 2.39.2