3351: Propagate caller-provided timeout from KeepClient to KeepWriterThread.

Also, use the timeout in the sign_for_old_server block (even though
this branch is unlikely to be used in real life now that the old Keep
server has been replaced).

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index 2844242360aeb735393e1d5bdfeeb7285461e359..fdb27f0d313ee57385d5df856516451d5cc57e93 100644 (file)
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -204,7 +204,7 @@ class KeepClient(object):
                           (str(threading.current_thread()),
                            self.args['data_hash'],
                            self.args['service_root']))
-            h = httplib2.Http(timeout=60)
+            h = httplib2.Http(timeout=self.args.get('timeout', None))
             url = self.args['service_root'] + self.args['data_hash']
             api_token = config.get('ARVADOS_API_TOKEN')
             headers = {'Authorization': "OAuth2 %s" % api_token}
@@ -224,7 +224,7 @@ class KeepClient(object):
                     body = KeepClient.sign_for_old_server(
                         self.args['data_hash'],
                         self.args['data'])
-                    h = httplib2.Http()
+                    h = httplib2.Http(timeout=self.args.get('timeout', None))
                     resp, content = h.request(url.encode('utf-8'), 'PUT',
                                               headers=headers,
                                               body=body)