diff --git a/mxq_job.c b/mxq_job.c index 5816f38d..daf4061e 100644 --- a/mxq_job.c +++ b/mxq_job.c @@ -120,8 +120,6 @@ char *mxq_job_status_to_name(uint64_t status) return "failed"; case MXQ_JOB_STATUS_CANCELLED: return "cancelled"; - case MXQ_JOB_STATUS_CANCELLING: - return "cancelling"; case MXQ_JOB_STATUS_UNKNOWN: return "unknown"; case MXQ_JOB_STATUS_FINISHED: diff --git a/mxq_job.h b/mxq_job.h index 483c16a3..d73561cb 100644 --- a/mxq_job.h +++ b/mxq_job.h @@ -69,8 +69,6 @@ struct mxq_job { #define MXQ_JOB_STATUS_KILLED 400 #define MXQ_JOB_STATUS_FAILED 750 -#define MXQ_JOB_STATUS_CANCELLING 989 - #define MXQ_JOB_STATUS_CANCELLED 990 #define MXQ_JOB_STATUS_UNKNOWN 999 #define MXQ_JOB_STATUS_FINISHED 1000 diff --git a/mysql/create_trigger.sql b/mysql/create_trigger.sql index f70082b8..afc016ae 100644 --- a/mysql/create_trigger.sql +++ b/mysql/create_trigger.sql @@ -132,21 +132,6 @@ CREATE TRIGGER mxq_update_job BEFORE UPDATE ON mxq_job group_jobs_running = group_jobs_running - 1, group_slots_running = group_slots_running - OLD.host_slots WHERE group_id = NEW.group_id; - - -- * -> 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), - stats_max_maxrss = GREATEST(stats_max_maxrss, NEW.stats_maxrss), - stats_max_utime_sec = GREATEST(stats_max_utime_sec, NEW.stats_utime_sec), - stats_max_stime_sec = GREATEST(stats_max_stime_sec, NEW.stats_stime_sec), - stats_max_real_sec = GREATEST(stats_max_real_sec, NEW.stats_real_sec), - stats_total_utime_sec = stats_total_utime_sec+NEW.stats_utime_sec, - stats_total_stime_sec = stats_total_stime_sec+NEW.stats_stime_sec, - stats_total_real_sec = stats_total_real_sec+NEW.stats_real_sec - WHERE group_id = NEW.group_id; - END IF; END IF; END; diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in index 6c0b3751..16f49115 100755 --- a/web/pages/mxq/mxq.in +++ b/web/pages/mxq/mxq.in @@ -87,7 +87,6 @@ sub db_init { KILLED => 400, FAILED => 750, UNKNOWN_PRE => 755, - CANCELLING => 989, CANCELLED => 990, UNKNOWN => 999, FINISHED => 1000,