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

Fix bug introduced in handling SIGALRM, don't unblock, was causing

slurmctld to exit.
parent 33488c24
No related branches found
No related tags found
No related merge requests found
...@@ -127,8 +127,6 @@ typedef struct queued_request { ...@@ -127,8 +127,6 @@ typedef struct queued_request {
time_t last_attempt; /* Time of last xmit attempt */ time_t last_attempt; /* Time of last xmit attempt */
} queued_request_t; } queued_request_t;
static int agent_sigarray[] = { SIGALRM, 0 };
static void _alarm_handler(int dummy); static void _alarm_handler(int dummy);
static inline void _comm_err(char *node_name); static inline void _comm_err(char *node_name);
static void _list_delete_retry(void *retry_entry); static void _list_delete_retry(void *retry_entry);
...@@ -171,7 +169,6 @@ void *agent(void *args) ...@@ -171,7 +169,6 @@ void *agent(void *args)
goto cleanup; goto cleanup;
xsignal(SIGALRM, _alarm_handler); xsignal(SIGALRM, _alarm_handler);
xsignal_unblock(agent_sigarray);
/* initialize the agent data structures */ /* initialize the agent data structures */
agent_info_ptr = _make_agent_info(agent_arg_ptr); agent_info_ptr = _make_agent_info(agent_arg_ptr);
...@@ -598,7 +595,7 @@ static void *_thread_per_node_rpc(void *args) ...@@ -598,7 +595,7 @@ static void *_thread_per_node_rpc(void *args)
msg.msg_type = msg_type; msg.msg_type = msg_type;
msg.data = task_ptr->msg_args_ptr; msg.data = task_ptr->msg_args_ptr;
thread_ptr->end_time = thread_ptr->start_time + COMMAND_TIMEOUT; thread_ptr->end_time = thread_ptr->start_time + COMMAND_TIMEOUT;
if (task_ptr->get_reply) { if (task_ptr->get_reply) {
if (slurm_send_recv_rc_msg(&msg, &rc, timeout) < 0) { if (slurm_send_recv_rc_msg(&msg, &rc, timeout) < 0) {
if (!srun_agent) if (!srun_agent)
......
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