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

Fix bug preventing backup slurmctld from responding to PING RPCs.

parent b9190cbc
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ documents those changes that are of interest to users and admins. ...@@ -5,6 +5,7 @@ documents those changes that are of interest to users and admins.
============================= =============================
-- Fix bug that could temporariy make nodes DOWN when they are really -- Fix bug that could temporariy make nodes DOWN when they are really
responding. responding.
-- Fix bug preventing backup slurmctld from responding to PING RPCs.
* Changes in SLURM 1.1.0-pre8 * Changes in SLURM 1.1.0-pre8
============================= =============================
......
...@@ -307,18 +307,16 @@ static void *_background_rpc_mgr(void *no_data) ...@@ -307,18 +307,16 @@ static void *_background_rpc_mgr(void *no_data)
if(ret_list) { if(ret_list) {
if(list_count(ret_list)>0) if(list_count(ret_list)>0)
error("Got %d, expecting 0 from " error("Got %d, expecting 0 from "
"message recieving", "message received",
list_count(ret_list)); list_count(ret_list));
error_code = _background_process_msg(msg);
if ((error_code == SLURM_SUCCESS)
&& (msg->msg_type == REQUEST_SHUTDOWN_IMMEDIATE)
&& (slurmctld_config.shutdown_time == 0))
slurmctld_config.shutdown_time = time(NULL);
list_destroy(ret_list); list_destroy(ret_list);
} else if(errno != SLURM_SUCCESS) } else if(errno != SLURM_SUCCESS)
error("slurm_receive_msg: %m"); error("slurm_receive_msg: %m");
else {
error_code = _background_process_msg(msg);
if ((error_code == SLURM_SUCCESS) &&
(msg->msg_type == REQUEST_SHUTDOWN_IMMEDIATE) &&
(slurmctld_config.shutdown_time == 0))
slurmctld_config.shutdown_time = time(NULL);
}
slurm_free_msg(msg); slurm_free_msg(msg);
/* close should only be called when the socket /* close should only be called when the socket
......
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