Francesco Romani has uploaded a new change for review.

Change subject: migration: add low-level socket timeout
......................................................................

migration: add low-level socket timeout

Helpful to troubleshoot werird failures like
rhbz#1348888

Change-Id: I00478b039f7dad1fb2c7d661dda9ba2a790a7a9b
Related-To: https://bugzilla.redhat.com/1348888
Signed-off-by: Francesco Romani <[email protected]>
---
M lib/vdsm/config.py.in
M vdsm/virt/migration.py
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/62430/1

diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 9813fe5..3c7a37e 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -261,6 +261,9 @@
         ('migration_create_timeout', '600',
             'Time in seconds defining how long we are going to wait for '
             'create migration response.'),
+
+        ('migration_socket_timeout', '600',
+            'Timeout in seconds for the low-level migration connection.'),
     ]),
 
     # Section: [rpc]
diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py
index c4cb107..6eba7f5 100644
--- a/vdsm/virt/migration.py
+++ b/vdsm/virt/migration.py
@@ -168,7 +168,9 @@
         else:
             host = self.remoteHost
 
-        client_socket = utils.create_connected_socket(host, int(port), sslctx)
+        timeout = config.getint('vars', 'migration_socket_timeout'))
+        client_socket = utils.create_connected_socket(
+            host, int(port), sslctx, timeout)
         return self._vm.cif.createStompClient(client_socket)
 
     def _setupVdsConnection(self):


-- 
To view, visit https://gerrit.ovirt.org/62430
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00478b039f7dad1fb2c7d661dda9ba2a790a7a9b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/admin/lists/[email protected]

Reply via email to