From 004f08487aa6e37d5d78aaeee81d21072e0ba194 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Wed, 19 Aug 2015 16:49:59 +0200 Subject: [PATCH] mxqkill: Set date_start and date_end to NOW() when cancelling jobs --- mysql/create_tables.sql | 2 ++ mysql/fix_cancelled_job_dates.sql | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 mysql/fix_cancelled_job_dates.sql diff --git a/mysql/create_tables.sql b/mysql/create_tables.sql index 3ce99fb..d134ab5 100644 --- a/mysql/create_tables.sql +++ b/mysql/create_tables.sql @@ -215,6 +215,8 @@ CREATE TRIGGER mxq_update_job BEFORE UPDATE ON mxq_job group_mtime=NULL WHERE group_id=NEW.group_id; ELSEIF NEW.job_status = 990 AND OLD.job_status IN (0, 100, 989) THEN + SET NEW.date_start = NOW(); + SET NEW.date_end = NEW.date_start; UPDATE mxq_group SET group_jobs_inq=group_jobs_inq-1, group_jobs_cancelled=group_jobs_cancelled+1, diff --git a/mysql/fix_cancelled_job_dates.sql b/mysql/fix_cancelled_job_dates.sql new file mode 100644 index 0000000..4a93576 --- /dev/null +++ b/mysql/fix_cancelled_job_dates.sql @@ -0,0 +1,8 @@ +UPDATE mxq_job + JOIN mxq_group + ON mxq_job.group_id = mxq_group.group_id + SET mxq_job.date_start = mxq_group.group_date_end, + mxq_job.date_end = mxq_group.group_date_end + WHERE job_status = 990 + AND (date_start = 0 OR date_end = 0); +