Merge branch 'master' into 2761-diagnostic-suite

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index 651cec4fea65025895047140ec072b383cb096d2..f0a872417a141ef0d291d9871e7fdb98e2784773 100644 (file)
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -20,6 +20,7 @@ import threading
 import timer
 import datetime
 import ssl
+import socket
 
 _logger = logging.getLogger('arvados.keep')
 global_client_object = None
@@ -204,7 +205,7 @@ class KeepClient(object):
     class KeepService(object):
         # Make requests to a single Keep service, and track results.
         HTTP_ERRORS = (httplib2.HttpLib2Error, httplib.HTTPException,
-                       ssl.SSLError)
+                       socket.error, ssl.SSLError)
 
         def __init__(self, root, **headers):
             self.root = root
@@ -324,7 +325,7 @@ class KeepClient(object):
                               self.service.last_result[1])
 
 
-    def __init__(self, api_client=None, proxy=None, timeout=60,
+    def __init__(self, api_client=None, proxy=None, timeout=300,
                  api_token=None, local_store=None):
         """Initialize a new KeepClient.
 
@@ -337,7 +338,7 @@ class KeepClient(object):
           of the ARVADOS_KEEP_PROXY configuration setting.  If you want to
           ensure KeepClient does not use a proxy, pass in an empty string.
         * timeout: The timeout for all HTTP requests, in seconds.  Default
-          60.
+          300.
         * api_token: If you're not using an API client, but only talking
           directly to a Keep proxy, this parameter specifies an API token
           to authenticate Keep requests.  It is an error to specify both

diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py
index 4ac9df17ecf838b4b65685636af0f8ab5b59c3b1..04bcab89d6f5b9d84b82182333de732714d2d86c 100644 (file)
--- a/sdk/python/tests/test_keep_client.py
+++ b/sdk/python/tests/test_keep_client.py
@@ -1,5 +1,6 @@
 import mock
 import os
+import socket
 import unittest
 
 import arvados
@@ -310,6 +311,18 @@ class KeepClientRetryGetTestCase(unittest.TestCase, KeepClientRetryTestMixin):
         with self.mock_responses(self.DEFAULT_EXPECT, 404, 200, 500):
             self.check_success(locator=self.HINTED_LOCATOR)
 
+    def test_try_next_server_after_timeout(self):
+        responses = iter([None, (fake_httplib2_response(200),
+                                 self.DEFAULT_EXPECT)])
+        def side_effect(*args, **kwargs):
+            response = next(responses)
+            if response is None:
+                raise socket.timeout("timed out")
+            else:
+                return response
+        with mock.patch('httplib2.Http.request', side_effect=side_effect):
+            self.check_success(locator=self.HINTED_LOCATOR)
+
 
 @no_backoff
 class KeepClientRetryPutTestCase(unittest.TestCase, KeepClientRetryTestMixin):