Skip to content
Jump to bottom

0.31.0 #149

Merged
merged 20 commits into from
Dec 29, 2023
Merged

0.31.0 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
03e404d
Remove group_sum_starttime
donald Dec 21, 2023
7777073
mx_mysql: Refactor error handling
donald Dec 23, 2023
9d04546
mx_mysql: Remove faulty errno range check
donald Dec 23, 2023
2e80051
mx_mysql: Fix warning in mx_mysql_option_set_default_file
donald Dec 25, 2023
2302d0b
global: Refactor error handling in mx_mysql callers
donald Dec 25, 2023
6cb0401
mx_mysql: Use standard assert()
donald Dec 25, 2023
51259a9
mx_mysql: Refactor bind functions to void
donald Dec 26, 2023
4dc09cc
mx_mysql: Remove unused fields from struct mx_mysql
donald Dec 25, 2023
2f1562c
mx_proc: Remove redudant assignment
donald Dec 25, 2023
d25a77e
mxq_job: Remove unused job_flags column
donald Dec 25, 2023
3b778de
sql: Add job_cancelled column
donald Dec 25, 2023
5cadf66
mxqkill: Add cancel_job
donald Dec 27, 2023
b636630
mxqkill: Use cancel_job()
donald Dec 28, 2023
c22b537
mxqd: Implement job cancellation
donald Dec 27, 2023
22aadf3
sql: Add mx_update_job2 trigger
donald Dec 28, 2023
ddc935f
mxq_job: Remove CANCELLING status
donald Dec 28, 2023
fe10e8e
web: Display job_cancelled in job details
donald Dec 27, 2023
7f4b2df
mx_mysql: Remove mx_mysql_error() function
donald Dec 28, 2023
1828b05
mx_mysql: Remove unnecessary check
donald Dec 28, 2023
5149518
sql: Remove unused group_jobs_restarted column
donald Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
657 changes: 245 additions & 412 deletions mx_mysql.c
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 15 additions & 35 deletions mx_mysql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,21 @@

#include "mx_util.h"

#ifdef MX_NDEBUG_MYSQL
# include <assert.h>
# define mx_mysql_assert_return_minus_errno(test, eno) \
assert(test)
# define mx_mysql_assert_return_NULL(test, eno) \
assert(test)
#else
# define mx_mysql_assert_return_minus_errno(test, eno) \
mx_assert_return_minus_errno(test, eno)
# define mx_mysql_assert_return_NULL(test, eno) \
mx_assert_return_NULL(test, eno)
#endif

#define mx_mysql_assert_usage_ok(res) \
do { \
if ((res) < 0) { \
assert((res) == -errno); \
assert(errno != EINVAL); \
assert(errno != EBADF); \
assert(errno != EUCLEAN); \
assert(res != EINVAL); \
assert(res != EBADF); \
assert(res != EUCLEAN); \
} \
} while (0)

struct mx_mysql {
MYSQL *mysql;

const char *func;

char *default_file;
char *default_group;
bool reconnect;

unsigned int saved_errno;
const char *error;
const char *sqlstate;
};

struct mx_mysql_bind_data {
Expand Down Expand Up @@ -74,8 +54,6 @@ struct mx_mysql_stmt {

MYSQL_STMT *stmt;

const char *func;

unsigned long field_count;
unsigned long param_count;

Expand Down Expand Up @@ -135,18 +113,20 @@ int mx_mysql_statement_close_no_bind_cleanup(struct mx_mysql_stmt **stmt);
#define mx_mysql_bind_init_param(b, c) mx_mysql_bind_init((b), (c), MX_MYSQL_BIND_TYPE_PARAM)
#define mx_mysql_bind_init_result(b, c) mx_mysql_bind_init((b), (c), MX_MYSQL_BIND_TYPE_RESULT)

int mx_mysql_bind_init(struct mx_mysql_bind *bind, unsigned long count, enum mx_mysql_bind_type type);
void mx_mysql_bind_init(struct mx_mysql_bind *bind, unsigned long count, enum mx_mysql_bind_type type);

void mx_mysql_bind_string(struct mx_mysql_bind *b, unsigned int index, char **value);

int mx_mysql_bind_string(struct mx_mysql_bind *b, unsigned int index, char **value);
void mx_mysql_bind_int8(struct mx_mysql_bind *b, unsigned int index, int8_t *value);
void mx_mysql_bind_int16(struct mx_mysql_bind *b, unsigned int index, int16_t *value);
void mx_mysql_bind_int32(struct mx_mysql_bind *b, unsigned int index, int32_t *value);
void mx_mysql_bind_int64(struct mx_mysql_bind *b, unsigned int index, int64_t *value);

int mx_mysql_bind_int8(struct mx_mysql_bind *b, unsigned int index, int8_t *value);
int mx_mysql_bind_int16(struct mx_mysql_bind *b, unsigned int index, int16_t *value);
int mx_mysql_bind_int32(struct mx_mysql_bind *b, unsigned int index, int32_t *value);
int mx_mysql_bind_int64(struct mx_mysql_bind *b, unsigned int index, int64_t *value);
void mx_mysql_bind_uint8(struct mx_mysql_bind *b, unsigned int index, uint8_t *value);
void mx_mysql_bind_uint16(struct mx_mysql_bind *b, unsigned int index, uint16_t *value);
void mx_mysql_bind_uint32(struct mx_mysql_bind *b, unsigned int index, uint32_t *value);
void mx_mysql_bind_uint64(struct mx_mysql_bind *b, unsigned int index, uint64_t *value);

int mx_mysql_bind_uint8(struct mx_mysql_bind *b, unsigned int index, uint8_t *value);
int mx_mysql_bind_uint16(struct mx_mysql_bind *b, unsigned int index, uint16_t *value);
int mx_mysql_bind_uint32(struct mx_mysql_bind *b, unsigned int index, uint32_t *value);
int mx_mysql_bind_uint64(struct mx_mysql_bind *b, unsigned int index, uint64_t *value);
char *mx_mysql_error(void);

#endif
2 changes: 1 addition & 1 deletion mx_proc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ int mx_proc_pid_stat_read(struct mx_proc_pid_stat *pps, char *fmt, ...)
assert(pps);

va_start(ap, fmt);
_mx_cleanup_free_ char *fname = fname = mx_vasprintf_forever(fmt, ap);
_mx_cleanup_free_ char *fname = mx_vasprintf_forever(fmt, ap);
va_end(ap);

res = mx_read_first_line_from_file(fname, &line);
Expand Down
97 changes: 42 additions & 55 deletions mxq_daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,38 +103,36 @@ int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon)
" prerequisites = ?"
);
if (!stmt) {
mx_log_err("mx_mysql_statement_prepare(): %m");
mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
mx_mysql_statement_close(&stmt);
return -errno;
return -EINVAL;
}

idx = 0;

res = mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->daemon_name));
res += mx_mysql_statement_param_bind(stmt, idx++, uint8, &(daemon->status));
res += mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->hostname));
res += mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->mxq_version));
res += mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->boot_id));
mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->daemon_name));
mx_mysql_statement_param_bind(stmt, idx++, uint8, &(daemon->status));
mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->hostname));
mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->mxq_version));
mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->boot_id));

res += mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->pid_starttime));
res += mx_mysql_statement_param_bind(stmt, idx++, uint32, &(daemon->daemon_pid));
mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->pid_starttime));
mx_mysql_statement_param_bind(stmt, idx++, uint32, &(daemon->daemon_pid));

res += mx_mysql_statement_param_bind(stmt, idx++, uint32, &(daemon->daemon_slots));
res += mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory));
res += mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_maxtime));
mx_mysql_statement_param_bind(stmt, idx++, uint32, &(daemon->daemon_slots));
mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory));
mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_maxtime));

res += mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory_limit_slot_soft));
res += mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory_limit_slot_hard));
res += mx_mysql_statement_param_bind(stmt, idx++, uint16, &(daemon->gpus_max));
res += mx_mysql_statement_param_bind(stmt, idx++, int32, &(daemon->daemon_flags));
res += mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->tags));
res += mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->prerequisites));

assert(res ==0);
mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory_limit_slot_soft));
mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory_limit_slot_hard));
mx_mysql_statement_param_bind(stmt, idx++, uint16, &(daemon->gpus_max));
mx_mysql_statement_param_bind(stmt, idx++, int32, &(daemon->daemon_flags));
mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->tags));
mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->prerequisites));

res = mx_mysql_statement_execute(stmt, &num_rows);
if (res < 0) {
mx_log_err("mx_mysql_statement_execute(): %m");
mx_log_err("mx_mysql_statement_execute(): %s", mx_mysql_error());
mx_mysql_statement_close(&stmt);
return res;
}
Expand Down Expand Up @@ -168,17 +166,15 @@ int mxq_daemon_shutdown(struct mx_mysql *mysql, struct mxq_daemon *daemon)
" status = " status_str(MXQ_DAEMON_STATUS_EXITED)
" WHERE daemon_id = ?";

res = mx_mysql_bind_init_param(&param, 1);
assert(res == 0);
mx_mysql_bind_init_param(&param, 1);

idx = 0;
res = 0;
res += mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_id));
mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_id));
assert(res == 0);
donald marked this conversation as resolved.
Show resolved Hide resolved

res += mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
if (res < 0) {
mx_log_err("mx_mysql_do_statement(): %m");
mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
return res;
}

Expand Down Expand Up @@ -209,19 +205,16 @@ int mxq_daemon_mark_crashed(struct mx_mysql *mysql, struct mxq_daemon *daemon)
" AND hostname = ?"
" AND daemon_name = ?";

res = mx_mysql_bind_init_param(&param, 3);
assert(res == 0);
mx_mysql_bind_init_param(&param, 3);

idx = 0;
res = 0;
res += mx_mysql_bind_var(&param, idx++, uint32, &daemon->daemon_id);
res += mx_mysql_bind_var(&param, idx++, string, &daemon->hostname);
res += mx_mysql_bind_var(&param, idx++, string, &daemon->daemon_name);
assert(res == 0);
mx_mysql_bind_var(&param, idx++, uint32, &daemon->daemon_id);
mx_mysql_bind_var(&param, idx++, string, &daemon->hostname);
mx_mysql_bind_var(&param, idx++, string, &daemon->daemon_name);

res += mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
if (res < 0) {
mx_log_err("mx_mysql_do_statement(): %m");
mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
return res;
}

Expand Down Expand Up @@ -249,18 +242,15 @@ int mxq_daemon_set_status(struct mx_mysql *mysql, struct mxq_daemon *daemon, uin
" status = ?"
" WHERE daemon_id = ?";

res = mx_mysql_bind_init_param(&param, 2);
assert(res == 0);
mx_mysql_bind_init_param(&param, 2);

idx = 0;
res = 0;
res += mx_mysql_bind_var(&param, idx++, uint8, &(status));
res += mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_id));
assert(res == 0);
mx_mysql_bind_var(&param, idx++, uint8, &(status));
mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_id));

res += mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
if (res < 0) {
mx_log_err("mx_mysql_do_statement(): %m");
mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
return res;
}

Expand Down Expand Up @@ -290,22 +280,19 @@ int mxq_daemon_update_statistics(struct mx_mysql *mysql, struct mxq_daemon *daem
" daemon_gpus_used = ?"
" WHERE daemon_id = ?";

res = mx_mysql_bind_init_param(&param, 6);
assert(res == 0);
mx_mysql_bind_init_param(&param, 6);

idx = 0;
res = 0;
res += mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_jobs_running));
res += mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_slots_running));
res += mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_threads_running));
res += mx_mysql_bind_var(&param, idx++, uint64, &(daemon->daemon_memory_used));
res += mx_mysql_bind_var(&param, idx++, uint16, &(daemon->gpus_used));
res += mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_id));
assert(res == 0);
mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_jobs_running));
mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_slots_running));
mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_threads_running));
mx_mysql_bind_var(&param, idx++, uint64, &(daemon->daemon_memory_used));
mx_mysql_bind_var(&param, idx++, uint16, &(daemon->gpus_used));
mx_mysql_bind_var(&param, idx++, uint32, &(daemon->daemon_id));

res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, &param);
if (res < 0) {
mx_log_err("mx_mysql_do_statement(): %m");
mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
return res;
}

Expand Down