diff --git a/mxq_job.c b/mxq_job.c index b9942927..5816f38d 100644 --- a/mxq_job.c +++ b/mxq_job.c @@ -18,11 +18,10 @@ #include "mxq_group.h" #include "mxq_job.h" -#define JOB_FIELDS_CNT 38 +#define JOB_FIELDS_CNT 37 #define JOB_FIELDS \ " job_id, " \ " job_status, " \ - " job_flags, " \ " job_priority, " \ " group_id, " \ " job_workdir, " \ @@ -67,7 +66,6 @@ static void bind_result_job_fields(struct mx_mysql_bind *result, struct mxq_job mx_mysql_bind_var(result, idx++, uint64, &(j->job_id)); mx_mysql_bind_var(result, idx++, uint16, &(j->job_status)); - mx_mysql_bind_var(result, idx++, uint64, &(j->job_flags)); mx_mysql_bind_var(result, idx++, uint16, &(j->job_priority)); mx_mysql_bind_var(result, idx++, uint64, &(j->group_id)); mx_mysql_bind_var(result, idx++, string, &(j->job_workdir)); diff --git a/mxq_job.h b/mxq_job.h index 15699b65..483c16a3 100644 --- a/mxq_job.h +++ b/mxq_job.h @@ -15,7 +15,6 @@ struct mxq_job { uint64_t job_id; uint16_t job_status; - uint64_t job_flags; uint16_t job_priority; uint64_t group_id; diff --git a/mxqsub.c b/mxqsub.c index ef236d51..26ae3b75 100644 --- a/mxqsub.c +++ b/mxqsub.c @@ -521,9 +521,7 @@ static int add_job(struct mx_mysql *mysql, struct mxq_job *j) " job_umask = ?," - " host_submit = ?," - - " job_flags = ?" + " host_submit = ?" ); if (!stmt) { mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error()); @@ -540,7 +538,6 @@ static int add_job(struct mx_mysql *mysql, struct mxq_job *j) mx_mysql_statement_param_bind(stmt, 6, string, &(j->job_stderr)); mx_mysql_statement_param_bind(stmt, 7, uint32, &(j->job_umask)); mx_mysql_statement_param_bind(stmt, 8, string, &(j->host_submit)); - mx_mysql_statement_param_bind(stmt, 9, uint64, &(j->job_flags)); res = mx_mysql_statement_execute(stmt, &num_rows); if (res < 0) { @@ -707,7 +704,6 @@ int main(int argc, char *argv[]) char *arg_mysql_default_file; char *arg_mysql_default_group; char arg_debug; - char arg_jobflags; u_int32_t arg_tmpdir; u_int16_t arg_gpu; @@ -796,7 +792,6 @@ int main(int argc, char *argv[]) arg_stderr = "stdout"; arg_umask = getumask(); arg_debug = 0; - arg_jobflags = 0; arg_groupid = UINT64_UNSET; arg_tmpdir = 10; // 10G arg_blacklist = NULL; @@ -1132,7 +1127,6 @@ int main(int argc, char *argv[]) group.job_max_per_node = arg_max_per_node; - job.job_flags = arg_jobflags; job.job_priority = arg_priority; job.job_workdir = arg_workdir; job.job_stdout = arg_stdout; diff --git a/mysql/create_tables.sql b/mysql/create_tables.sql index 7885e52e..fe0b7581 100644 --- a/mysql/create_tables.sql +++ b/mysql/create_tables.sql @@ -2,7 +2,6 @@ CREATE TABLE IF NOT EXISTS mxq_group ( group_id INT8 UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, group_name VARCHAR(128) NOT NULL DEFAULT 'default', group_status INT1 UNSIGNED NOT NULL DEFAULT 0, - group_flags INT8 UNSIGNED NOT NULL DEFAULT 0, group_priority INT2 UNSIGNED NOT NULL DEFAULT 127, group_blacklist VARCHAR(1000) NOT NULL DEFAULT '', group_whitelist VARCHAR(1000) NOT NULL DEFAULT '', @@ -71,7 +70,6 @@ CREATE TABLE IF NOT EXISTS mxq_group ( CREATE TABLE IF NOT EXISTS mxq_job ( job_id INT8 UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, job_status INT2 UNSIGNED NOT NULL DEFAULT 0, - job_flags INT8 UNSIGNED NOT NULL DEFAULT 0, job_priority INT2 UNSIGNED NOT NULL DEFAULT 127, group_id INT8 UNSIGNED NOT NULL, diff --git a/mysql/migrate_016_remove_job_flags.sql b/mysql/migrate_016_remove_job_flags.sql new file mode 100644 index 00000000..50a06716 --- /dev/null +++ b/mysql/migrate_016_remove_job_flags.sql @@ -0,0 +1,2 @@ +ALTER TABLE mxq_job + DROP COLUMN job_flags; diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in index eac6ac1f..6c0b3751 100755 --- a/web/pages/mxq/mxq.in +++ b/web/pages/mxq/mxq.in @@ -587,7 +587,6 @@ sub job { $out.=<<"EOF";
 job_status       : $job_status_text
-job_flags        : $o{job_flags}
 job_priority     : $o{job_priority}
 
 group_id         : $link_group_id