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 5/5] fix #5440: hmp helpers: drive{add, del}: increase timeout
Date: Fri,  3 May 2024 13:19:54 +0200	[thread overview]
Message-ID: <20240503111956.46543-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20240503111956.46543-1-f.ebner@proxmox.com>

The default timeout for HMP commands is 5 seconds.

While it should be rather fast to attach a new drive to QEMU, a busy
system might take longer, so future-proof and increase to 60 seconds.

On the other hand, detaching a drive needs to complete any pending IO
on it, so use the same 10 minutes timeout that's used for
drive-related QMP commands.

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

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 82e7d6a6..ba3d9f26 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4377,7 +4377,7 @@ sub qemu_driveadd {
     my $io_uring = min_version($kvmver, 6, 0);
     my $drive = print_drive_commandline_full($storecfg, $vmid, $device, undef, $io_uring);
     $drive =~ s/\\/\\\\/g;
-    my $ret = PVE::QemuServer::Monitor::hmp_cmd($vmid, "drive_add auto \"$drive\"");
+    my $ret = PVE::QemuServer::Monitor::hmp_cmd($vmid, "drive_add auto \"$drive\"", 60);
 
     # If the command succeeds qemu prints: "OK"
     return 1 if $ret =~ m/OK/s;
@@ -4388,7 +4388,7 @@ sub qemu_driveadd {
 sub qemu_drivedel {
     my ($vmid, $deviceid) = @_;
 
-    my $ret = PVE::QemuServer::Monitor::hmp_cmd($vmid, "drive_del drive-$deviceid");
+    my $ret = PVE::QemuServer::Monitor::hmp_cmd($vmid, "drive_del drive-$deviceid", 10 * 60);
     $ret =~ s/^\s+//;
 
     return 1 if $ret eq "";
-- 
2.39.2



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


  parent reply	other threads:[~2024-05-03 11:20 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-03 11:19 [pve-devel] [PATCH-SERIES qemu-server/manager] fix #5440: HMP/disk timeout improvements Fiona Ebner
2024-05-03 11:19 ` [pve-devel] [PATCH qemu-server 1/5] monitor: allow passing timeout for a HMP command Fiona Ebner
2024-05-03 11:19 ` [pve-devel] [PATCH qemu-server 2/5] api: human monitor: increase timeout to 25 seconds Fiona Ebner
2024-05-03 11:19 ` [pve-devel] [PATCH qemu-server 3/5] vzdump: increase timeout for attaching drives to 60 seconds Fiona Ebner
2024-05-03 11:19 ` [pve-devel] [PATCH qemu-server 4/5] cli: qm: increase timeout for monitor commands to 30 seconds Fiona Ebner
2024-05-03 11:19 ` Fiona Ebner [this message]
2024-05-03 11:19 ` [pve-devel] [PATCH manager 1/2] ui: qemu: hardware: use background delay for asynchronous remove tasks Fiona Ebner
2024-05-03 11:19 ` [pve-devel] [PATCH manager 2/2] ui: qemu: hardware: use asynchronous remove API call for disk hot-unplug Fiona Ebner
2024-06-11 12:08 ` [pve-devel] applied-series: [PATCH-SERIES qemu-server/manager] fix #5440: HMP/disk timeout improvements Fabian Grünbichler

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=20240503111956.46543-6-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