Merge pull request #92 from mariux64/fix-91

Fix #91 "jobs started after server was blacklisted"
mariux64 · Aug 13, 2020 · 329c893 · 329c893
2 parents 5afd6c9 + ef4fcef
commit 329c893
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 MXQ_VERSION_MAJOR = 0
 MXQ_VERSION_MINOR = 26
-MXQ_VERSION_PATCH = 5
+MXQ_VERSION_PATCH = 6
 MXQ_VERSION_EXTRA = "beta"
 MXQ_VERSIONDATE = 2016
 

diff --git a/mxqd.c b/mxqd.c
@@ -1428,10 +1428,10 @@ unsigned long start_user(struct mxq_user_list *ulist, long slots_to_start)
 
         group  = &glist->group;
 
-        if (glist->jobs_running == group->group_jobs) {
+        if (glist->jobs_running >= group->group_jobs) {
             continue;
         }
-        if (glist->jobs_running == glist->jobs_max) {
+        if (glist->jobs_running >= glist->jobs_max) {
             continue;
         }
         if (mxq_group_jobs_inq(group) == 0) {

diff --git a/mxqd.h b/mxqd.h
@@ -44,9 +44,6 @@ struct mxq_group_list {
     unsigned long global_threads_running;
     unsigned long global_slots_running;
 
-    int        server_is_qualified_evaluated;
-    int        server_is_qualified;
-
     short orphaned;
 };
 

diff --git a/mxqd_control.c b/mxqd_control.c
@@ -137,9 +137,6 @@ static void _group_list_init(struct mxq_group_list *glist)
     glist->slots_max  = slots_max;
     glist->memory_max = memory_max;
 
-    glist->server_is_qualified_evaluated = 0;
-    glist->server_is_qualified = 0;
-
     glist->orphaned = 0;
 }