public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 2/2] qmp client: add default timeouts for more blockdev commands
Date: Thu, 12 Dec 2024 11:02:47 +0100	[thread overview]
Message-ID: <20241212100247.20926-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20241212100247.20926-1-f.ebner@proxmox.com>

For the HMP 'drive_add' command, the used timeout is 1 minute and for the
'drive_del' command, the used timeout is 10 minutes, because IO might
need to be finished. Use the same for 'blockdev-add' respectively
'blockdev-del'.

For 'drive-mirror', 10 minutes is used, so use the same for
'blockdev-mirror'.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/QMPClient.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index b03f1da8..5fa8b815 100644
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -119,6 +119,7 @@ sub cmd {
 	    # that are executed upon thaw, so use 3 minutes to be on the safe side.
 	    $timeout = 3 * 60;
 	} elsif (
+	    $cmd->{execute} eq 'blockdev-add' ||
 	    $cmd->{execute} eq 'device_add' ||
 	    $cmd->{execute} eq 'device_del' ||
 	    $cmd->{execute} eq 'netdev_add' ||
@@ -129,6 +130,8 @@ sub cmd {
 	    $timeout = 60;
 	} elsif (
 	    $cmd->{execute} eq 'backup-cancel' ||
+	    $cmd->{execute} eq 'blockdev-del' ||
+	    $cmd->{execute} eq 'blockdev-mirror' ||
 	    $cmd->{execute} eq 'blockdev-snapshot-delete-internal-sync' ||
 	    $cmd->{execute} eq 'blockdev-snapshot-internal-sync' ||
 	    $cmd->{execute} eq 'block-job-cancel' ||
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


      reply	other threads:[~2024-12-12 10:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-12 10:02 [pve-devel] [PATCH qemu-server 1/2] fix #5985: qmp client: increase timeout for {device, netdev, object}_{add, del} commands Fiona Ebner
2024-12-12 10:02 ` Fiona Ebner [this message]

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=20241212100247.20926-2-f.ebner@proxmox.com \
    --to=f.ebner@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal