[pve-devel] [PATCH qemu-server 02/15] qmp client: add default timeouts for more blockdev commands

[Fiona Ebner]

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 at proxmox.com>
---
 src/PVE/QMPClient.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PVE/QMPClient.pm b/src/PVE/QMPClient.pm
index dec5276d..87d61144 100644
--- a/src/PVE/QMPClient.pm
+++ b/src/PVE/QMPClient.pm
@@ -119,7 +119,8 @@ sub cmd {
             # that are executed upon thaw, so use 3 minutes to be on the safe side.
             $timeout = 3 * 60;
         } elsif (
-            $cmd->{execute} eq 'device_add'
+            $cmd->{execute} eq 'blockdev-add'
+            || $cmd->{execute} eq 'device_add'
             || $cmd->{execute} eq 'device_del'
             || $cmd->{execute} eq 'netdev_add'
             || $cmd->{execute} eq 'netdev_del'
@@ -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.47.2