Switch to using a CloseForLongOperation around the sleep

buildman/jobutil/buildstatus.py

@@ -1,6 +1,5 @@
-from data.database import BUILD_PHASE, UseThenDisconnect
+from data.database import BUILD_PHASE
 from data import model
-from app import app
 
 class StatusHandler(object):
   """ Context wrapper for writing status to build logs. """
@@ -44,7 +43,6 @@ class StatusHandler(object):
     self._append_log_message(phase, self._build_logs.PHASE, extra_data)
 
     # Update the repository build with the new phase
-    with UseThenDisconnect(app.config):
     repo_build = model.get_repository_build(self._uuid)
     repo_build.phase = phase
     repo_build.save()

buildman/server.py

@@ -120,12 +120,10 @@ class BuilderServer(object):
     self._session_factory.remove(component)
 
   def _job_heartbeat(self, build_job):
-    with database.UseThenDisconnect(app.config):
     WorkQueue.extend_processing(build_job.job_item, seconds_from_now=JOB_TIMEOUT_SECONDS,
                                 retry_count=1, minimum_extension=MINIMUM_JOB_EXTENSION)
 
   def _job_complete(self, build_job, job_status):
-    with database.UseThenDisconnect(app.config):
     if job_status == BuildJobResult.INCOMPLETE:
       self._queue.incomplete(build_job.job_item, restore_retry=True, retry_after=30)
     elif job_status == BuildJobResult.ERROR:
@@ -144,11 +142,10 @@ class BuilderServer(object):
       logger.debug('Checking for more work for %d active workers',
                    self._lifecycle_manager.num_workers())
 
-      with database.UseThenDisconnect(app.config):
       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)
+        with database.CloseForLongOperation(app.config):
           yield From(trollius.sleep(WORK_CHECK_TIMEOUT))
           continue
 
@@ -156,8 +153,6 @@ class BuilderServer(object):
         build_job = BuildJob(job_item)
       except BuildJobLoadException as irbe:
         logger.exception(irbe)
-
-        with database.UseThenDisconnect(app.config):
         self._queue.incomplete(job_item, restore_retry=False)
 
       logger.debug('Build job found. Checking for an avaliable worker.')
@@ -167,8 +162,6 @@ class BuilderServer(object):
         logger.debug('Build job scheduled. Running: %s', self._job_count)
       else:
         logger.debug('All workers are busy. Requeuing.')
-
-        with database.UseThenDisconnect(app.config):
         self._queue.incomplete(job_item, restore_retry=True, retry_after=0)
 
   @trollius.coroutine