hub: Wrap handing out jobs into a transaction

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/hub/handlers.py b/src/hub/handlers.py
index e5eecf89c033bad2cdf9c83bfa57ea9b8b105f88..f53a36454a099adec8516f7955daa78da91b4726 100644 (file)
--- a/src/hub/handlers.py
+++ b/src/hub/handlers.py
@@ -515,22 +515,15 @@ class BuildersJobsQueueHandler(BuildersBaseHandler):
                        logging.warning("Connection closed")
                        return
 
-               # Check if there is a job for us.
-               job = self.builder.get_next_job()
-
-               # Got no job, wait and try again.
-               if not job:
-                       # Check if we have been running for too long.
-                       if self.runtime >= self.max_runtime:
-                               logging.debug("Exceeded max. runtime. Finishing request.")
-                               return self.finish()
+               with self.db.transaction():
+                       # Check if there is a job for us.
+                       job = self.builder.get_next_job()
 
-                       # Try again in a jiffy.
-                       self.add_timeout(self.heartbeat, self.callback)
-                       return
+                       # Got no job, wait and try again.
+                       if not job:
+                               return self.add_timeout(10, self.callback)
 
-               try:
-                       # Set job to dispatching state.
+                       # We got a job!
                        job.state = "dispatching"
 
                        # Set our build host.
@@ -547,22 +540,6 @@ class BuildersJobsQueueHandler(BuildersBaseHandler):
 
                        # Send build information to the builder.
                        self.finish(ret)
-               except:
-                       # If anything went wrong, we reset the state.
-                       job.state = "pending"
-                       raise
-
-       @property
-       def heartbeat(self):
-               return 15 # 15 seconds
-
-       @property
-       def max_runtime(self):
-               timeout = self.get_argument_int("timeout", None)
-               if timeout:
-                       return timeout - self.heartbeat
-
-               return 300 # 5 min
 
 
 class BuildersJobsStateHandler(BuildersBaseHandler):