Remove ununsed job states

mariux64 · May 9, 2017 · ebc30a7 · ebc30a7
1 parent 7276703
commit ebc30a7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/mxq_job.c b/mxq_job.c
@@ -120,22 +120,8 @@ char *mxq_job_status_to_name(uint64_t status)
             return "loaded";
         case MXQ_JOB_STATUS_RUNNING:
             return "running";
-        case MXQ_JOB_STATUS_UNKNOWN_RUN:
-            return "running-unknown";
-        case MXQ_JOB_STATUS_EXTRUNNING:
-            return "running-external";
-        case MXQ_JOB_STATUS_STOPPED:
-            return "stopped";
-        case MXQ_JOB_STATUS_EXIT:
-            return "exited";
-        case MXQ_JOB_STATUS_KILLING:
-            return "killing";
-        case MXQ_JOB_STATUS_KILLED:
-            return "killed";
         case MXQ_JOB_STATUS_FAILED:
             return "failed";
-        case MXQ_JOB_STATUS_UNKNOWN_PRE:
-            return "unknownpre";
         case MXQ_JOB_STATUS_CANCELLED:
             return "cancelled";
         case MXQ_JOB_STATUS_CANCELLING:

diff --git a/mxq_job.h b/mxq_job.h
@@ -67,24 +67,15 @@ struct mxq_job {
 #define MXQ_JOB_STATUS_LOADED       150
 #define MXQ_JOB_STATUS_RUNNING      200
 
-#define MXQ_JOB_STATUS_UNKNOWN_RUN  250
-#define MXQ_JOB_STATUS_EXTRUNNING   300
-#define MXQ_JOB_STATUS_STOPPED      350
-
-#define MXQ_JOB_STATUS_KILLING      399
-
 #define MXQ_JOB_STATUS_KILLED       400
 #define MXQ_JOB_STATUS_FAILED       750
-#define MXQ_JOB_STATUS_UNKNOWN_PRE  755
 
 #define MXQ_JOB_STATUS_CANCELLING   989
 
 #define MXQ_JOB_STATUS_CANCELLED    990
 #define MXQ_JOB_STATUS_UNKNOWN      999
 #define MXQ_JOB_STATUS_FINISHED    1000
 
-#define MXQ_JOB_STATUS_EXIT        1024
-
 #define MXQ_JOB_FLAGS_RESTART_ON_HOSTFAIL (1<<0)
 #define MXQ_JOB_FLAGS_REQUEUE_ON_HOSTFAIL (1<<1)
 

diff --git a/mysql/create_trigger.sql b/mysql/create_trigger.sql
@@ -74,8 +74,8 @@ CREATE TRIGGER mxq_update_job BEFORE UPDATE ON mxq_job
                                         + UNIX_TIMESTAMP(OLD.date_start) * NEW.host_slots
                 WHERE group_id = NEW.group_id;
 
-            -- LOADED(150) | RUNNING(200) | UNKNOWN_RUN(250) | EXTRUNNING(300) | STOPPED(350) | KILLING(399) -> KILLED(400) | FAILED(750)
-            ELSEIF NEW.job_status IN (400, 750) AND OLD.job_status IN (150, 200, 250, 300, 350, 399) THEN
+            -- LOADED(150) | RUNNING(200) -> KILLED(400) | FAILED(750)
+            ELSEIF NEW.job_status IN (400, 750) AND OLD.job_status IN (150, 200) THEN
 
                 UPDATE mxq_group SET
                     group_sum_starttime   = group_sum_starttime - LEAST(group_sum_starttime, UNIX_TIMESTAMP(OLD.date_start) * OLD.host_slots),
@@ -103,8 +103,8 @@ CREATE TRIGGER mxq_update_job BEFORE UPDATE ON mxq_job
                     group_jobs_cancelled = group_jobs_cancelled + 1
                 WHERE group_id = NEW.group_id;
 
-            -- LOADED(150) | RUNNING(200) | UNKNOWN_RUN(250) | KILLING(399) -> UNKNOWN(999)
-            ELSEIF NEW.job_status = 999 AND OLD.job_status IN (150, 200, 250, 399) THEN
+            -- LOADED(150) | RUNNING(200)  -> UNKNOWN(999)
+            ELSEIF NEW.job_status = 999 AND OLD.job_status IN (150, 200) THEN
 
                 UPDATE mxq_group SET
                     group_sum_starttime = group_sum_starttime - LEAST(group_sum_starttime, UNIX_TIMESTAMP(OLD.date_start) * OLD.host_slots),
@@ -113,16 +113,16 @@ CREATE TRIGGER mxq_update_job BEFORE UPDATE ON mxq_job
                     group_jobs_unknown  = group_jobs_unknown  + 1
                 WHERE group_id = NEW.group_id;
 
-            -- UNKNOWN(999) -> KILLED(400) | FAILED(750) | UNKNWON_PRE(755)
-            ELSEIF NEW.job_status = 999 AND OLD.job_status IN (400, 750, 755) THEN
+            -- KILLED(400)  -> UNKNOWN(999)
+            ELSEIF NEW.job_status = 999 AND OLD.job_status IN (400) THEN
 
                 UPDATE mxq_group SET
                    group_jobs_failed  = group_jobs_failed  - 1,
                    group_jobs_unknown = group_jobs_unknown + 1
                 WHERE group_id = NEW.group_id;
 
-            -- LOADED(150) | RUNNING(200) | UNKNOWN_RUN(250) | EXTRUNNING(300) | STOPPED(350) | KILLING(399) -> FINISHED(1000)
-            ELSEIF NEW.job_status = 1000 AND OLD.job_status IN (150, 200, 250, 300, 350, 399) THEN
+            -- LOADED(150) | RUNNING(200) -> FINISHED(1000)
+            ELSEIF NEW.job_status = 1000 AND OLD.job_status IN (150, 200) THEN
 
                 UPDATE mxq_group SET
                     group_sum_starttime = group_sum_starttime - LEAST(group_sum_starttime, UNIX_TIMESTAMP(OLD.date_start) * OLD.host_slots),
@@ -142,8 +142,8 @@ CREATE TRIGGER mxq_update_job BEFORE UPDATE ON mxq_job
                     stats_total_real_sec_finished  = stats_total_real_sec_finished  + NEW.stats_real_sec
                 WHERE group_id = NEW.group_id;
 
-            -- * -> NOT IN [ KILLING(399) | UNKNOWN_PRE(755) | CANCELLING(989) | CANCELLED(990) ]
-            ELSEIF NEW.job_status NOT IN (399, 755, 989, 990) THEN
+            -- * -> NOT IN [ CANCELLING(989) | CANCELLED(990) ]
+            ELSEIF NEW.job_status NOT IN (989, 990) THEN
 
                 UPDATE mxq_group SET
                    stats_max_sumrss    = GREATEST(stats_max_sumrss, NEW.stats_max_sumrss),