[rhmessaging-commits] rhmessaging commits: r2703 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-10-29 20:12:33 -0400 (Wed, 29 Oct 2008)
New Revision: 2703

Modified:
   mgmt/trunk/cumin/python/cumin/job.py
Log:
Added a completed state to the JobSet phases

Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py	2008-10-29 20:30:27 UTC (rev 2702)
+++ mgmt/trunk/cumin/python/cumin/job.py	2008-10-30 00:12:33 UTC (rev 2703)
@@ -1229,6 +1229,7 @@
         self.add_state("r", "Running")
         self.add_state("i", "Idle")
         self.add_state("h", "Held")
+        self.add_state("c", "Completed")
         self.add_state("d", "Removed")
         
     def get_sql_constraint(self, session):
@@ -1249,8 +1250,15 @@
         elif phase == "h":
             sql = "(j.job_status = %i" % JobStatusInfo.get_status_int("Held") + \
                     " and %s)" % alive
+        elif phase == "c":
+            comotose = "(c.rec_time is null or " + \
+                "c.rec_time <= now() - interval '10 minutes')"
+            sql = "(j.job_status = %i" % JobStatusInfo.get_status_int("Completed") + \
+                    " and %s)" % comotose
         else:
-            sql = "j.deletion_time is not null or j.job_status = %i" % JobStatusInfo.get_status_int("Removed")
+            not_completed = "(j.deletion_time is not null and j.job_status <> %i )" % JobStatusInfo.get_status_int("Completed")
+            is_removed = "j.job_status = %i" % JobStatusInfo.get_status_int("Removed")
+            sql = " or ".join((not_completed, is_removed)) 
 
         return sql