Merge remote-tracking branch 'origin/master' into ephemeral

buildman/builder.py

@@ -49,8 +49,8 @@ def run_build_manager():
   if os.environ.get('SSL_CONFIG'):
     logger.debug('Loading SSL cert and key')
     ssl_context = SSLContext()
-    ssl_context.load_cert_chain(os.environ.get('SSL_CONFIG') + '/ssl.cert',
-                                os.environ.get('SSL_CONFIG') + '/ssl.key')
+    ssl_context.load_cert_chain(os.path.join(os.environ.get('SSL_CONFIG'), 'ssl.cert'),
+                                os.path.join(os.environ.get('SSL_CONFIG'), 'ssl.key'))
 
   server = BuilderServer(app.config['SERVER_HOSTNAME'], dockerfile_build_queue, build_logs,
                          user_files, manager_klass, build_manager_config[1], public_ip)

buildman/manager/basemanager.py

@@ -59,3 +59,9 @@ class BaseManager(object):
         automatically requeued.
     """
     raise NotImplementedError
+
+  def num_workers(self):
+    """ Returns the number of active build workers currently registered. This includes those
+        that are currently busy and awaiting more work.
+    """
+    raise NotImplementedError

buildman/manager/enterprise.py

@@ -74,3 +74,5 @@ class EnterpriseManager(BaseManager):
     if build_component in self.ready_components:
       self.ready_components.remove(build_component)
 
+  def num_workers(self):
+    return len(self.build_components)

buildman/server.py

@@ -9,7 +9,7 @@ from aiowsgi import create_server as create_wsgi_server
 from flask import Flask
 from threading import Event
 from trollius.coroutines import From
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from buildman.jobutil.buildjob import BuildJob, BuildJobLoadException
 from data.queue import WorkQueue
@@ -140,7 +140,7 @@ class BuilderServer(object):
   @trollius.coroutine
   def _work_checker(self):
     while self._current_status == 'running':
-      logger.debug('Checking for more work')
+      logger.debug('Checking for more work for %d active workers', self._lifecycle_manager.num_workers())
       job_item = self._queue.get(processing_time=self._lifecycle_manager.setup_time())
       if job_item is None:
         logger.debug('No additional work found. Going to sleep for %s seconds', WORK_CHECK_TIMEOUT)