vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch to a 30s maximum timeout

Browse source
This commit is contained in:
Joseph Schorr 2015-06-25 23:08:49 -04:00
parent 0953bae44d
commit 6e6610f31a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
buildman/manager/ephemeral.py
View file

@ -22,7 +22,7 @@ from util.morecollections import AttrDict
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
ETCD_DISABLE_TIMEOUT = 0 ETCD_MAX_WATCH_TIMEOUT = 30
EC2_API_TIMEOUT = 20 EC2_API_TIMEOUT = 20
RETRY_IMMEDIATELY_TIMEOUT = 0 RETRY_IMMEDIATELY_TIMEOUT = 0
@ -85,7 +85,7 @@ class EphemeralBuilderManager(BaseManager):
'*' if recursive else '', existing_index, etcd_result) '*' if recursive else '', existing_index, etcd_result)
except ReadTimeoutError: except ReadTimeoutError:
logger.debug('Read-timeout on etcd watch: %s', etcd_key) logger.debug('Read-timeout on etcd watch %s, rescheduling', etcd_key)
except (ProtocolError, etcd.EtcdException): except (ProtocolError, etcd.EtcdException):
logger.exception('Exception on etcd watch: %s', etcd_key) logger.exception('Exception on etcd watch: %s', etcd_key)
@ -112,7 +112,7 @@ class EphemeralBuilderManager(BaseManager):
'*' if recursive else '', start_index) '*' if recursive else '', start_index)
watch_future = self._etcd_client.watch(etcd_key, recursive=recursive, index=start_index, watch_future = self._etcd_client.watch(etcd_key, recursive=recursive, index=start_index,
timeout=ETCD_DISABLE_TIMEOUT) timeout=ETCD_MAX_WATCH_TIMEOUT)
watch_future.add_done_callback(callback_wrapper) watch_future.add_done_callback(callback_wrapper)
self._watch_tasks[watch_task_key] = async(watch_future) self._watch_tasks[watch_task_key] = async(watch_future)