Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
mxq_job: Remove unused parameter from mxq_unload_job_from_server
  • Loading branch information
donald committed May 5, 2022
1 parent ad98991 commit de3553c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion mxq_job.c
Expand Up @@ -803,7 +803,7 @@ int mxq_load_jobs_running_on_server(struct mx_mysql *mysql, struct mxq_job **job
return res;
}

int mxq_unload_job_from_server(struct mx_mysql *mysql, struct mxq_daemon *daemon, uint64_t job_id) {
int mxq_unload_job_from_server(struct mx_mysql *mysql, uint64_t job_id) {

/* set a job from LOADED back to INQ. This needs to reset what
* mxq_assign_job_from_group_to_daemon() and mxq_set_job_status_loaded_on_server()
Expand Down
2 changes: 1 addition & 1 deletion mxq_job.h
Expand Up @@ -93,5 +93,5 @@ int mxq_set_job_status_unknown(struct mx_mysql *mysql, struct mxq_job *job);
int mxq_job_set_tmpfilenames(struct mxq_group *g, struct mxq_job *j);
int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *mxqjob, uint64_t group_id, struct mxq_daemon *daemon,unsigned long slots_per_job);
int mxq_load_jobs_running_on_server(struct mx_mysql *mysql, struct mxq_job **jobs_result, struct mxq_daemon *daemon);
int mxq_unload_job_from_server(struct mx_mysql *mysql, struct mxq_daemon *daemon, uint64_t job_id);
int mxq_unload_job_from_server(struct mx_mysql *mysql, uint64_t job_id);
#endif
6 changes: 3 additions & 3 deletions mxqd.c
Expand Up @@ -1323,12 +1323,12 @@ static unsigned long start_job(struct mxq_group_list *glist)
mx_mysql_connect_forever(&(server->mysql));
if (pid < 0) {
mx_log_err("fork: %m");
mxq_unload_job_from_server(server->mysql, daemon, job->job_id);
mxq_unload_job_from_server(server->mysql, job->job_id);
return(0);
}
waitpid(pid, &status, 0);
if (status) {
mxq_unload_job_from_server(server->mysql, daemon, job->job_id);
mxq_unload_job_from_server(server->mysql, job->job_id);
return 0;
}
}
Expand All @@ -1343,7 +1343,7 @@ static unsigned long start_job(struct mxq_group_list *glist)
if (pid < 0) {
mx_log_err("fork: %m");
cpuset_clear_running(&job->host_cpu_set,&server->cpu_set_available);
mxq_unload_job_from_server(server->mysql, daemon, job->job_id);
mxq_unload_job_from_server(server->mysql, job->job_id);
return 0;
} else if (pid == 0) {
job->host_pid = getpid();
Expand Down

0 comments on commit de3553c

Please sign in to comment.