Remove the boto timeout set (doesn't work anyway) and add some better logging to the scheduler

This commit is contained in:
Joseph Schorr 2015-02-25 16:00:14 -05:00
parent 5dd78f76c7
commit 4551b3a957
2 changed files with 3 additions and 5 deletions

View file

@ -46,10 +46,6 @@ class EphemeralBuilderManager(BaseManager):
_etcd_client_klass = etcd.Client
def __init__(self, *args, **kwargs):
# Set a timeout so that boto connections don't hang indefinitely.
boto.config.add_section('Boto')
boto.config.set('Boto', 'http_socket_timeout', '10')
self._shutting_down = False
self._manager_config = None

View file

@ -180,11 +180,13 @@ class BuilderServer(object):
return
if scheduled:
logger.debug('Marking build %s as scheduled', build_job.repo_build.uuid)
status_handler = StatusHandler(self._build_logs, build_job.repo_build.uuid)
status_handler.set_phase('build-scheduled')
self._job_count = self._job_count + 1
logger.debug('Build job scheduled. Running: %s', self._job_count)
logger.debug('Build job %s scheduled. Running: %s', build_job.repo_build.uuid,
self._job_count)
else:
logger.debug('All workers are busy. Requeuing.')
self._queue.incomplete(job_item, restore_retry=True, retry_after=0)