Merge branch 'master' into mx_mysql

* master: mysql: Add column job_id_new to table mxq_job to link restarted job mxqsub: Improve assertions mxqsub: Fix minor memory leaks mxqsub: Add --restart option mxqsub: Let --verbose be more verbose mxq: Remove obsolete mxq.h mxqsub: Improve handling of mysql config defaults mxqsub: Cleanup missing includes and dependencies mxqsub: Remove build dependency to mxq_mysql
mariux · May 22, 2015 · cb30353 · cb30353
2 parents ffc0ecb + dc7499b
commit cb30353
Show file tree

Hide file tree

Showing 13 changed files with 143 additions and 153 deletions.
diff --git a/Makefile b/Makefile
@@ -46,11 +46,14 @@ endif
 
 ##############################################################################
 
-MXQ_MYSQL_DEFAULT_FILE = ${SYSCONFDIR}/mxq/mysql.cnf
+MXQ_MYSQL_DEFAULT_FILE  = ${SYSCONFDIR}/mxq/mysql.cnf
+MXQ_MYSQL_DEFAULT_GROUP = mxqclient
+
 MXQ_INITIAL_PATH = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 
-CFLAGS_MXQ_MYSQL_DEFAULT_FILE = -DMXQ_MYSQL_DEFAULT_FILE=\"$(MXQ_MYSQL_DEFAULT_FILE)\"
-CFLAGS_MXQ_INITIAL_PATH       = -DMXQ_INITIAL_PATH=\"$(MXQ_INITIAL_PATH)\"
+CFLAGS_MXQ_MYSQL_DEFAULT_FILE  = -DMXQ_MYSQL_DEFAULT_FILE=\"$(MXQ_MYSQL_DEFAULT_FILE)\"
+CFLAGS_MXQ_MYSQL_DEFAULT_GROUP = -DMXQ_MYSQL_DEFAULT_GROUP=\"$(MXQ_MYSQL_DEFAULT_GROUP)\"
+CFLAGS_MXQ_INITIAL_PATH        = -DMXQ_INITIAL_PATH=\"$(MXQ_INITIAL_PATH)\"
 
 MYSQL_CONFIG = mysql_config
 
@@ -177,12 +180,6 @@ mx_flock.h += mx_flock.h
 mx_mysql.h += mx_mysql.h
 mx_mysql.h += $(mx_util.h)
 
-### mxq.h --------------------------------------------------------------
-
-mxq.h += mxq.h
-mxq.h += $(mxq_group.h)
-mxq.h += $(mxq_job.h)
-
 ### mxq_mysql.h --------------------------------------------------------
 
 mxq_mysql.h += mxq_mysql.h
@@ -192,7 +189,6 @@ mxq_mysql.h += $(mxq_util.h)
 
 mxq_util.h += mxq_util.h
 mxq_util.h += $(mx_log.h)
-mxq_util.h += $(mxq.h)
 
 ### mxq_group.h --------------------------------------------------------
 
@@ -314,7 +310,6 @@ clean: CLEAN += mxq_group.o
 
 mxq_job.o: $(mx_util.h)
 mxq_job.o: $(mx_log.h)
-mxq_job.o: $(mxq.h)
 mxq_job.o: $(mxq_job.h)
 mxq_job.o: $(mxq_group.h)
 mxq_job.o: $(mxq_mysql.h)
@@ -342,13 +337,15 @@ clean: CLEAN += mxqd.o
 ### mxqsub.o -------------------------------------------------------
 
 mxqsub.o: $(mx_getopt.h)
-mxqsub.o: $(mxq_util.h)
 mxqsub.o: $(mx_util.h)
 mxqsub.o: $(mx_log.h)
-mxqsub.o: $(mxq_mysql.h)
 mxqsub.o: $(mx_mysql.h)
+mxqsub.o: $(mxq_group.h)
+mxqsub.o: $(mxq_job.h)
+mxqsub.o: $(mxq_util.h)
 mxqsub.o: CFLAGS += $(CFLAGS_MYSQL)
 mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_FILE)
+mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_GROUP)
 
 clean: CLEAN += mxqsub.o
 
@@ -377,7 +374,6 @@ install:: mxqd
 ### mxqsub ------------------------------------------------------------
 
 mxqsub: mx_getopt.o
-mxqsub: mxq_mysql.o
 mxqsub: mxq_util.o
 mxqsub: mx_util.o
 mxqsub: mx_log.o

diff --git a/mxq.h b/mxq.h
diff --git a/mxq_group.c b/mxq_group.c
@@ -8,6 +8,7 @@
 #include "mx_log.h"
 
 #include "mxq_group.h"
+#include "mxq_job.h"
 #include "mxq_mysql.h"
 
 #define MXQ_GROUP_FIELDS "group_id," \

diff --git a/mxq_job.c b/mxq_job.c
@@ -16,7 +16,6 @@
 #include "mxq_group.h"
 #include "mxq_job.h"
 #include "mxq_mysql.h"
-#include "mxq.h"
 
 #define MXQ_JOB_FIELDS "job_id, " \
                 "job_status, " \

diff --git a/mxq_job.h b/mxq_job.h
@@ -4,6 +4,9 @@
 #include <stdint.h>
 #include <mysql.h>
 
+#include <sys/time.h>
+#include <sys/resource.h>
+
 #include "mxq_group.h"
 
 struct mxq_job {
@@ -74,6 +77,13 @@ struct mxq_job {
 #define MXQ_JOB_STATUS_UNKNOWN      999
 #define MXQ_JOB_STATUS_FINISHED    1000
 
+#define MXQ_JOB_FLAGS_RESTART_ON_HOSTFAIL (1<<0)
+#define MXQ_JOB_FLAGS_REQUEUE_ON_HOSTFAIL (1<<1)
+
+#define MXQ_JOB_FLAGS_AUTORESTART         (1<<62)
+#define MXQ_JOB_FLAGS_HOSTFAIL            (1<<63)
+
+
 #define _to_string(s) #s
 #define status_str(x) _to_string(x)
 

diff --git a/mxq_job_dump.c b/mxq_job_dump.c
@@ -12,6 +12,9 @@
 #include "mxq_util.h"
 #include "mxq_mysql.h"
 
+#include "mxq_group.h"
+#include "mxq_job.h"
+
 
 struct result {
     struct mxq_job job;

diff --git a/mxq_util.c b/mxq_util.c
@@ -94,14 +94,6 @@ void *realloc_forever(void *ptr, size_t size)
     } while (1);
 }
 
-void mxq_free_job(struct mxq_job_full *job)
-{
-    if (!job)
-        return;
-
-    free(job);
-}
-
 char **strvec_new(void)
 {
     char **strvec;

diff --git a/mxq_util.h b/mxq_util.h
@@ -6,12 +6,8 @@
 #include <string.h>
 #include <mysql.h>
 
-#include "mxq.h"
-
 char *mxq_hostname(void);
 
-void mxq_free_job(struct mxq_job_full *job);
-
 char **stringtostringvec(int argc, char *s);
 char *stringvectostring(int argc, char *argv[]);
 int chrcnt(char *s, char c);

diff --git a/mxqd.c b/mxqd.c
@@ -30,7 +30,6 @@
 #include "mx_util.h"
 #include "mx_log.h"
 
-#include "mxq.h"
 #include "mxq_group.h"
 #include "mxq_job.h"
 #include "mxq_mysql.h"

diff --git a/mxqdump.c b/mxqdump.c
@@ -14,6 +14,8 @@
 #include "mxq_mysql.h"
 #include "mx_getopt.h"
 
+#include "mxq_group.h"
+
 #ifndef MXQ_VERSION
 #define MXQ_VERSION "0.00"
 #endif

diff --git a/mxqkill.c b/mxqkill.c
@@ -22,6 +22,9 @@
 #include "mxq_mysql.h"
 #include "mx_getopt.h"
 
+#include "mxq_group.h"
+#include "mxq_job.h"
+
 #ifndef MXQ_VERSION
 #define MXQ_VERSION "0.00"
 #endif