|
 |
d0ea73 |
From e61cbd740b84eb78a1ffc52223e4f1cc3202c978 Mon Sep 17 00:00:00 2001
|
|
|
d0ea73 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
d0ea73 |
Date: Tue, 5 Jun 2018 19:09:43 +0100
|
|
|
d0ea73 |
Subject: [PATCH] v2v: -o rhv-upload: Set inactivity timeout (RHBZ#1586198).
|
|
|
d0ea73 |
MIME-Version: 1.0
|
|
|
d0ea73 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d0ea73 |
Content-Transfer-Encoding: 8bit
|
|
|
d0ea73 |
|
|
|
d0ea73 |
This increases the inactivity timeout for transfers from the default
|
|
|
d0ea73 |
(60 seconds in oVirt < 4.2.3, 600 seconds in >= 4.2.3), up to 1 hour,
|
|
|
d0ea73 |
so that we should never hit it for ordinary transfers.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Note this requires oVirt >= 4.2.3. The corresponding oVirt fix was
|
|
|
d0ea73 |
https://bugzilla.redhat.com/1563278
|
|
|
d0ea73 |
|
|
|
d0ea73 |
I also replaced the deprecated ‘image’ parameter with ‘disk’.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Thanks: Nir Soffer, Daniel Erez.
|
|
|
d0ea73 |
(cherry picked from commit f25404c65f8e078a3ca5bd5a1ab91343edd22506)
|
|
|
d0ea73 |
---
|
|
|
d0ea73 |
v2v/rhv-upload-plugin.py | 5 ++---
|
|
|
d0ea73 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py
|
|
|
d0ea73 |
index 791c9e7d2..b4557b83c 100644
|
|
|
d0ea73 |
--- a/v2v/rhv-upload-plugin.py
|
|
|
d0ea73 |
+++ b/v2v/rhv-upload-plugin.py
|
|
|
d0ea73 |
@@ -123,9 +123,8 @@ def open(readonly):
|
|
|
d0ea73 |
# Create a new image transfer.
|
|
|
d0ea73 |
transfer = transfers_service.add(
|
|
|
d0ea73 |
types.ImageTransfer(
|
|
|
d0ea73 |
- image = types.Image(
|
|
|
d0ea73 |
- id = disk.id
|
|
|
d0ea73 |
- )
|
|
|
d0ea73 |
+ disk = types.Disk(id = disk.id),
|
|
|
d0ea73 |
+ inactivity_timeout = 3600,
|
|
|
d0ea73 |
)
|
|
|
d0ea73 |
)
|
|
|
d0ea73 |
debug("transfer.id = %r" % transfer.id)
|
|
|
d0ea73 |
--
|
|
 |
6b9fda |
2.21.0
|
|
|
d0ea73 |
|