Skip to content
Snippets Groups Projects
Commit 379007b8 authored by Morris Jette's avatar Morris Jette
Browse files

job write lock added to agent_retry()

This is required to manage the configuration completion.
bug 3366
parent ce9a2d79
No related branches found
No related tags found
No related merge requests found
...@@ -1309,11 +1309,15 @@ static void *_agent_retry(void *arg) ...@@ -1309,11 +1309,15 @@ static void *_agent_retry(void *arg)
pthread_t thread_mail = 0; pthread_t thread_mail = 0;
pthread_attr_t attr_mail; pthread_attr_t attr_mail;
mail_info_t *mi = NULL; mail_info_t *mi = NULL;
/* Write lock on jobs */
slurmctld_lock_t job_write_lock =
{ NO_LOCK, WRITE_LOCK, NO_LOCK, NO_LOCK };
mail_too = retry_args_ptr->mail_too; mail_too = retry_args_ptr->mail_too;
min_wait = retry_args_ptr->min_wait; min_wait = retry_args_ptr->min_wait;
xfree(arg); xfree(arg);
lock_slurmctld(job_write_lock);
slurm_mutex_lock(&retry_mutex); slurm_mutex_lock(&retry_mutex);
if (retry_list) { if (retry_list) {
static time_t last_msg_time = (time_t) 0; static time_t last_msg_time = (time_t) 0;
...@@ -1346,6 +1350,7 @@ static void *_agent_retry(void *arg) ...@@ -1346,6 +1350,7 @@ static void *_agent_retry(void *arg)
/* too much work already */ /* too much work already */
slurm_mutex_unlock(&agent_cnt_mutex); slurm_mutex_unlock(&agent_cnt_mutex);
slurm_mutex_unlock(&retry_mutex); slurm_mutex_unlock(&retry_mutex);
unlock_slurmctld(job_write_lock);
return NULL; return NULL;
} }
slurm_mutex_unlock(&agent_cnt_mutex); slurm_mutex_unlock(&agent_cnt_mutex);
...@@ -1401,6 +1406,7 @@ static void *_agent_retry(void *arg) ...@@ -1401,6 +1406,7 @@ static void *_agent_retry(void *arg)
list_iterator_destroy(retry_iter); list_iterator_destroy(retry_iter);
} }
slurm_mutex_unlock(&retry_mutex); slurm_mutex_unlock(&retry_mutex);
unlock_slurmctld(job_write_lock);
if (queued_req_ptr) { if (queued_req_ptr) {
agent_arg_ptr = queued_req_ptr->agent_arg_ptr; agent_arg_ptr = queued_req_ptr->agent_arg_ptr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment