Merge pull request #155 from mariux64/fix-154

mxqkill: Correct job counts for cancelled groups
mariux64 · Jan 8, 2024 · cd68e5c · cd68e5c
2 parents 9dda809 + 1255023
commit cd68e5c
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/mxqkill.c b/mxqkill.c
@@ -130,13 +130,9 @@ static int update_job_status_cancelled_by_group(struct mx_mysql *mysql, struct m
     assert(g->group_id);
 
     stmt = mx_mysql_statement_prepare(mysql,
-            "UPDATE mxq_job SET"
-                " job_status = " status_str(MXQ_JOB_STATUS_CANCELLED)
-                " WHERE group_id = ?"
-                " AND job_status IN (" status_str(MXQ_JOB_STATUS_INQ) "," status_str(MXQ_JOB_STATUS_ASSIGNED) ")"
-                " AND host_hostname = ''"
-                " AND server_id = ''"
-                " AND host_pid = 0"
+            "UPDATE mxq_job SET job_cancelled = TRUE"
+            " WHERE group_id = ?"
+            " AND job_status = " status_str(MXQ_JOB_STATUS_INQ)
             );
     if (!stmt) {
         mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());