jobs: Automatically abort jobs that have timed out

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

diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index 69d6f8dd24c2548d2b8efd257a661b7049b3872a..f08ce70b9cd7fe042f7ee0edf11630c217c7a10f 100644 (file)
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -116,7 +116,7 @@ class Backend(object):
                self.run_periodic_task(3600, self.cleanup)
 
                # Automatically abort any jobs that run for forever
-               #self.run_periodic_task(60, self.jobs.abort)
+               self.run_periodic_task(60, self.jobs.abort)
 
        def read_config(self, path):
                c = configparser.ConfigParser()

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 6a007ec28d077cc66316707e28f29042a48a48b9..bab665647a616f7d7ae36fe81a51c3f46f5db7c1 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -177,25 +177,29 @@ class Jobs(base.Object):
                """
                log.debug("Aborting timed-out jobs...")
 
-               jobs = self._get_jobs("""
-                       SELECT
-                               *
-                       FROM
-                               jobs
-                       WHERE
-                               deleted_at IS NULL
-                       AND
-                               finished_at IS NULL
-                       AND
-                               started_at IS NOT NULL
-                       AND
-                               timeout IS NOT NULL
-                       AND
-                               started_at + timeout < CURRENT_TIMESTAMP
-               """)
+               stmt = (
+                       sqlalchemy
+                       .select(
+                               Job
+                       )
+                       .where(
+                               # Don't care about deleted jobs
+                               Job.deleted_at == None,
+
+                               # Jobs must be running
+                               Job.started_at != None,
+                               Job.finished_at == None,
+
+                               # Jobs must have a timeout
+                               Job.timeout != None,
+
+                               # The timeout must have passed
+                               Job.started_at + Job.timeout < sqlalchemy.func.current_timestamp(),
+                       )
+               )
 
                # Abort them all...
-               async for job in jobs:
+               async for job in self.db.fetch(stmt):
                        await job.abort()