Skip to content

Commit

Permalink
global: Refactor error handling in mx_mysql callers
Browse files Browse the repository at this point in the history 
`mx_mysql` no longer delivers errors in `errno`, so this commit changes
the callers to not use `errno` after a failed call to a `mx_mysql` function,
but only the return value. The "%m" format for getting the error message
is replaced with "%s" in conjunction with `mx_mysql_error()`.

This commit also removes some redundant error logging from nested
function calls.
  • Loading branch information
@donald
donald committed Dec 29, 2023
1 parent 2e80051 commit 2302d0b
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 68 deletions.
14 changes: 7 additions & 7 deletions mxq_daemon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ 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;
Expand Down Expand Up @@ -134,7 +134,7 @@ int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon)

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 @@ -178,7 +178,7 @@ int mxq_daemon_shutdown(struct mx_mysql *mysql, struct mxq_daemon *daemon)

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 @@ -221,7 +221,7 @@ int mxq_daemon_mark_crashed(struct mx_mysql *mysql, struct mxq_daemon *daemon)

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 @@ -260,7 +260,7 @@ int mxq_daemon_set_status(struct mx_mysql *mysql, struct mxq_daemon *daemon, uin

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 @@ -305,7 +305,7 @@ int mxq_daemon_update_statistics(struct mx_mysql *mysql, struct mxq_daemon *daem

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
12 changes: 6 additions & 6 deletions mxq_group.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ int mxq_load_group(struct mx_mysql *mysql, struct mxq_group **mxq_groups, uint64

res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
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 @@ -222,7 +222,7 @@ int mxq_load_all_groups(struct mx_mysql *mysql, struct mxq_group **mxq_groups)

res = mx_mysql_do_statement(mysql, query, NULL, &result, &g, (void **)&groups, sizeof(*groups));
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 @@ -259,7 +259,7 @@ int mxq_load_all_groups_for_user(struct mx_mysql *mysql, struct mxq_group **mxq_

res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
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 @@ -298,7 +298,7 @@ int mxq_load_active_groups_for_user(struct mx_mysql *mysql, struct mxq_group **m

res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
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 @@ -329,7 +329,7 @@ int mxq_load_running_groups(struct mx_mysql *mysql, struct mxq_group **mxq_group

res = mx_mysql_do_statement(mysql, query, NULL, &result, &g, (void **)&groups, sizeof(*groups));
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 @@ -367,7 +367,7 @@ int mxq_load_running_groups_for_user(struct mx_mysql *mysql, struct mxq_group **

res = mx_mysql_do_statement(mysql, query, &param, &result, &g, (void **)&groups, sizeof(*groups));
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
19 changes: 8 additions & 11 deletions mxq_job.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static int do_jobs_statement(struct mx_mysql *mysql, char *query, struct mx_mysq

res = mx_mysql_do_statement(mysql, query, param, &result, &j, (void **)jobs, sizeof(**jobs));
if (res < 0) {
mx_log_err("mx_mysql_do_statement(): %m");
mx_log_err("mx_mysql_do_statement(): %s", mx_mysql_error());
return res;
}
for (i=0;i<res;i++)
Expand Down Expand Up @@ -372,7 +372,7 @@ static int mxq_assign_job_from_group_to_daemon(struct mx_mysql *mysql, uint64_t

res = mx_mysql_do_statement_noresult(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 @@ -416,7 +416,7 @@ int mxq_unassign_jobs_of_server(struct mx_mysql *mysql, struct mxq_daemon *daemo

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 @@ -459,7 +459,7 @@ static int mxq_set_job_status_loaded_on_server(struct mx_mysql *mysql, struct mx

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 @@ -516,7 +516,7 @@ int mxq_set_job_status_running(struct mx_mysql *mysql, struct mxq_job *job)

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 @@ -608,7 +608,7 @@ int mxq_set_job_status_exited(struct mx_mysql *mysql, struct mxq_job *job)

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 @@ -640,7 +640,7 @@ int mxq_set_job_status_unknown(struct mx_mysql *mysql, struct mxq_job *job)

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 @@ -728,7 +728,6 @@ int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *j
res = mxq_load_job_from_group_assigned_to_daemon(mysql, &jobs_tmp, group_id, daemon);

if(res < 0) {
mx_log_err(" group_id=%lu :: mxq_load_job_from_group_assigned_to_daemon: %m", group_id);
return 0;
}
if(res == 1) {
Expand All @@ -739,7 +738,6 @@ int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *j

res = mxq_assign_job_from_group_to_daemon(mysql, group_id, daemon, slots_per_job);
if (res < 0) {
mx_log_err(" group_id=%lu :: mxq_assign_job_from_group_to_daemon(): %m", group_id);
return 0;
}
if (res == 0) {
Expand All @@ -750,7 +748,6 @@ int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *j

res = mxq_set_job_status_loaded_on_server(mysql, job);
if (res < 0) {
mx_log_err(" group_id=%lu job_id=%lu :: mxq_set_job_status_loaded_on_server(): %m", group_id, job->job_id);
return 0;
}
if (res == 0) {
Expand Down Expand Up @@ -837,7 +834,7 @@ int mxq_unload_job_from_server(struct mx_mysql *mysql, uint64_t job_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;
}
return res;
Expand Down
12 changes: 6 additions & 6 deletions mxqadmin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static int update_group_flags_closed(struct mx_mysql *mysql, uint64_t group_id,
" AND user_uid = ?"
);
if (!stmt) {
mx_log_err("mx_mysql_statement_prepare(): %m");
mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
return -(errno=EIO);
}

Expand All @@ -101,7 +101,7 @@ static int update_group_flags_closed(struct mx_mysql *mysql, uint64_t group_id,
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);

Expand All @@ -128,7 +128,7 @@ static int update_group_flags_reopen(struct mx_mysql *mysql, uint64_t group_id,
" AND user_uid = ?"
);
if (!stmt) {
mx_log_err("mx_mysql_statement_prepare(): %m");
mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
return -(errno=EIO);
}

Expand All @@ -140,7 +140,7 @@ static int update_group_flags_reopen(struct mx_mysql *mysql, uint64_t group_id,
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);

Expand All @@ -164,7 +164,7 @@ int _close_group_for_user(struct mx_mysql *mysql, uint64_t group_id, uint64_t us
}

if (res < 0) {
mx_log_err("closing group failed: %m");
mx_log_err("closing group failed");
return res;
}

Expand All @@ -187,7 +187,7 @@ int _reopen_group_for_user(struct mx_mysql *mysql, uint64_t group_id, uint64_t u
}

if (res < 0) {
mx_log_err("opening group failed: %m");
mx_log_err("opening group failed");
return res;
}

Expand Down
12 changes: 6 additions & 6 deletions mxqkill.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int update_group_status_cancelled(struct mx_mysql *mysql, struct mxq_grou
" AND group_jobs-group_jobs_finished-group_jobs_failed-group_jobs_cancelled-group_jobs_unknown > 0"
);
if (!stmt) {
mx_log_err("mx_mysql_statement_prepare(): %m");
mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
return -(errno=EIO);
}

Expand All @@ -101,7 +101,7 @@ static int update_group_status_cancelled(struct mx_mysql *mysql, struct mxq_grou
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);

Expand Down Expand Up @@ -130,7 +130,7 @@ static int update_job_status_cancelled_by_group(struct mx_mysql *mysql, struct m
" AND host_pid = 0"
);
if (!stmt) {
mx_log_err("mx_mysql_statement_prepare(): %m");
mx_log_err("mx_mysql_statement_prepare(): %s", mx_mysql_error());
return -(errno=EIO);
}

Expand All @@ -140,7 +140,7 @@ static int update_job_status_cancelled_by_group(struct mx_mysql *mysql, struct m
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);

Expand Down Expand Up @@ -473,7 +473,7 @@ int main(int argc, char *argv[])
mx_log_warning("no active group with group_id=%lu found for user=%s(%d)",
group.group_id, group.user_name, group.user_uid);
else
mx_log_err("cancelling group failed: %m");
mx_log_err("cancelling group failed");
return 1;
}

Expand All @@ -497,7 +497,7 @@ int main(int argc, char *argv[])
group.group_id);
return 0;
} else {
mx_log_err("cancelling jobs failed: %m");
mx_log_err("cancelling jobs failed");
return 1;
}
}
Expand Down
Loading

0 comments on commit 2302d0b

Please sign in to comment.