From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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 ACF4090A6A
for <pve-devel@lists.proxmox.com>; Fri, 23 Sep 2022 10:30:12 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8FE0A215B4
for <pve-devel@lists.proxmox.com>; Fri, 23 Sep 2022 10:30:12 +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
for <pve-devel@lists.proxmox.com>; Fri, 23 Sep 2022 10:30:11 +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 5260644597
for <pve-devel@lists.proxmox.com>; Fri, 23 Sep 2022 10:30:11 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 23 Sep 2022 10:30:09 +0200
Message-Id: <20220923083010.946543-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220923083010.946543-1-d.csapak@proxmox.com>
References: <20220923083010.946543-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.072 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 qemu-server v3 2/3] qmeventd: cancel 'forced
cleanup' when normal cleanup succeeds
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2022 08:30:12 -0000
instead of always sending a SIGKILL to the target pid.
It was not that much of a problem since the timeout previously was 5
seconds and we used pifds where possible, thus the chance of killing the
wrong process was rather slim.
Now we increased the timeout to 60s which makes the race a bit more likely
(when not using pidfds), so remove it from the 'forced_cleanups' list when
the normal cleanup succeeds.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
qmeventd/qmeventd.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c
index e14bc76..4d0c695 100644
--- a/qmeventd/qmeventd.c
+++ b/qmeventd/qmeventd.c
@@ -416,6 +416,24 @@ cleanup_qemu_client(struct Client *client)
}
}
+static void
+remove_cleanup_data(void *ptr, void *client_ptr) {
+ struct CleanupData *data = ptr;
+ struct Client *client = client_ptr;
+ if (data->pid == client->pid) {
+ forced_cleanups = g_slist_remove(forced_cleanups, data);
+ free(data);
+ }
+}
+
+static void
+remove_from_forced_cleanup(struct Client *client) {
+ if (g_slist_length(forced_cleanups) > 0) {
+ VERBOSE_PRINT("removing %s from forced cleanups\n", client->qemu.vmid);
+ g_slist_foreach(forced_cleanups, remove_cleanup_data, client);
+ }
+}
+
void
cleanup_client(struct Client *client)
{
@@ -442,6 +460,7 @@ cleanup_client(struct Client *client)
break;
}
+ remove_from_forced_cleanup(client);
free(client);
}
--
2.30.2