[Pkg-debile-commits] [debile-master] 01/01: Hotfixed the infinite jobs forfeit

[Léo Cavaillé]

This is an automated email from the git hooks/post-receive script.

leo.cavaille-guest pushed a commit to branch master
in repository debile-master.

commit dff924e7bbc41b8ee57271020498b23757a72e86
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Tue Oct 1 15:31:01 2013 +0200

    Hotfixed the infinite jobs forfeit
---
 debilemaster/orm.py    |    2 ++
 debilemaster/server.py |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/debilemaster/orm.py b/debilemaster/orm.py
index 73bfa40..ef26ded 100644
--- a/debilemaster/orm.py
+++ b/debilemaster/orm.py
@@ -284,6 +284,8 @@ class Job(Base):
     suite = Column(String(50), nullable=False)
     # A simple boolean, true if the job failed to run
     failed = Column(Boolean)
+    # Retries forfeited
+    retries = Column(Integer, default=0)
 
     def serialize(self):
         serial = row2dict(self)
diff --git a/debilemaster/server.py b/debilemaster/server.py
index c58794c..4a679c4 100644
--- a/debilemaster/server.py
+++ b/debilemaster/server.py
@@ -331,6 +331,7 @@ class DebileMasterInterface(object):
 
         j.assigned_at = None
         j.machine = None
+        j.retries = j.retries + 1
         session.commit()
         return True
 
@@ -354,6 +355,7 @@ class DebileMasterInterface(object):
                 filter(Job.type.in_(types)).\
                 filter(Job.arch.in_(arches)).\
                 filter(Job.suite.in_(suites)).\
+                filter(Job.retries < 5).\
                 first()
 
         if j:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-master.git