mxqd: Fix mxq_group status inconsistency

mariux · Jul 27, 2015 · f7bd620 · f7bd620
1 parent bbe8f57
commit f7bd620
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mxq_group.c b/mxq_group.c
@@ -122,7 +122,8 @@ inline uint64_t mxq_group_jobs_active(struct mxq_group *g)
     active -= mxq_group_jobs_done(g);
 
     if (active != g->group_jobs_inq+g->group_jobs_running)
-        mx_log_warning("BUG: mxq_group: inconsistent 'active' (inq+run) value");
+        mx_log_warning("BUG: mxq_group: inconsistent 'active'=%lu (inq=%lu+run=%lu)=%lu value",
+            active, g->group_jobs_inq, g->group_jobs_running, g->group_jobs_inq+g->group_jobs_running);
 
     return active;
 }
@@ -135,7 +136,8 @@ inline uint64_t mxq_group_jobs_inq(struct mxq_group *g)
     inq -= g->group_jobs_running;
 
     if (inq != g->group_jobs_inq)
-        mx_log_warning("BUG: mxq_group: inconsistent inq value");
+        mx_log_warning("BUG: mxq_group: inconsistent inq value (%lu != %lu)",
+            inq, g->group_jobs_inq);
 
     return inq;
 }

diff --git a/mxqd.c b/mxqd.c
@@ -590,6 +590,7 @@ struct mxq_job_list *group_add_job(struct mxq_group_list *group, struct mxq_job
     server->threads_running += mxqgrp->job_threads;
 
     mxqgrp->group_jobs_running++;
+    mxqgrp->group_jobs_inq--;
 
     group->jobs_running++;
     user->jobs_running++;