Skip to content
Snippets Groups Projects
Commit 158ccd3a authored by Moe Jette's avatar Moe Jette
Browse files

Relocated pthread_join function to where the thread was created for greater

clarity. No change in functionality or logic.
parent caf9707d
No related branches found
No related tags found
No related merge requests found
......@@ -126,6 +126,7 @@ void run_backup(void)
slurmctld_conf.backup_controller);
pthread_kill(slurmctld_config.thread_id_sig, SIGTERM);
pthread_join(slurmctld_config.thread_id_sig, NULL);
pthread_join(slurmctld_config.thread_id_rpc, NULL);
/* clear old state and read new state */
job_fini();
......@@ -168,8 +169,6 @@ static void *_background_signal_hand(void *no_data)
slurmctld_config.shutdown_time = time(NULL);
/* send REQUEST_SHUTDOWN_IMMEDIATE RPC */
slurmctld_shutdown();
pthread_join(slurmctld_config.thread_id_rpc, NULL);
return NULL; /* Normal termination */
break;
case SIGABRT: /* abort */
......@@ -205,7 +204,7 @@ static void *_background_rpc_mgr(void *no_data)
}
/*
* Procss incoming RPCs indefinitely
* Process incoming RPCs indefinitely
*/
while (done_flag == false) {
/* accept needed for stream implementation
......
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