all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v3 2/3] qmeventd: cancel 'forced cleanup' when normal cleanup succeeds
Date: Fri, 23 Sep 2022 10:30:09 +0200	[thread overview]
Message-ID: <20220923083010.946543-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220923083010.946543-1-d.csapak@proxmox.com>

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





  parent reply	other threads:[~2022-09-23  8:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-23  8:30 [pve-devel] [PATCH qemu-server v3 0/3] qmeventd: improve shutdown behaviour Dominik Csapak
2022-09-23  8:30 ` [pve-devel] [PATCH qemu-server v3 1/3] qmeventd: rework 'forced_cleanup' handling and set timeout to 60s Dominik Csapak
2022-09-23  8:30 ` Dominik Csapak [this message]
2022-09-23  8:30 ` [pve-devel] [PATCH qemu-server v3 3/3] qmeventd: send QMP 'quit' command instead of SIGTERM Dominik Csapak
2022-09-23  8:36 ` [pve-devel] [PATCH qemu-server v3 0/3] qmeventd: improve shutdown behaviour Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220923083010.946543-3-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal