From 3dbc535af14e4548278e4a5ace3e9692ccda1872 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 28 Jan 2004 18:15:34 +0000
Subject: [PATCH] Fix bug introduced in handling SIGALRM, don't unblock, was
causing slurmctld to exit.
---
src/slurmctld/agent.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 4cb1b7a1d17..f7ee1f12f21 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -127,8 +127,6 @@ typedef struct queued_request {
time_t last_attempt; /* Time of last xmit attempt */
} queued_request_t;
-static int agent_sigarray[] = { SIGALRM, 0 };
-
static void _alarm_handler(int dummy);
static inline void _comm_err(char *node_name);
static void _list_delete_retry(void *retry_entry);
@@ -171,7 +169,6 @@ void *agent(void *args)
goto cleanup;
xsignal(SIGALRM, _alarm_handler);
- xsignal_unblock(agent_sigarray);
/* initialize the agent data structures */
agent_info_ptr = _make_agent_info(agent_arg_ptr);
@@ -598,7 +595,7 @@ static void *_thread_per_node_rpc(void *args)
msg.msg_type = msg_type;
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 (slurm_send_recv_rc_msg(&msg, &rc, timeout) < 0) {
if (!srun_agent)
--
GitLab