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

Minor mods to avoid sending duplicate messages to the BGL front-end node.

parent f7b20a9a
No related branches found
No related tags found
No related merge requests found
...@@ -3414,6 +3414,9 @@ _xmit_new_end_time(struct job_record *job_ptr) ...@@ -3414,6 +3414,9 @@ _xmit_new_end_time(struct job_record *job_ptr)
node_names[MAX_NAME_LEN * agent_args->node_count], node_names[MAX_NAME_LEN * agent_args->node_count],
node_record_table_ptr[i].name, MAX_NAME_LEN); node_record_table_ptr[i].name, MAX_NAME_LEN);
agent_args->node_count++; agent_args->node_count++;
#ifdef HAVE_BGL
break; /* only do one front-end node */
#endif
} }
agent_args->msg_args = job_time_msg_ptr; agent_args->msg_args = job_time_msg_ptr;
......
...@@ -1558,11 +1558,6 @@ void msg_to_slurmd (slurm_msg_type_t msg_type) ...@@ -1558,11 +1558,6 @@ void msg_to_slurmd (slurm_msg_type_t msg_type)
} }
for (i = 0; i < node_record_count; i++) { for (i = 0; i < node_record_count; i++) {
#ifdef HAVE_BGL
if (i > 0)
break;
#endif
if ((kill_agent_args->node_count+1) > kill_buf_rec_size) { if ((kill_agent_args->node_count+1) > kill_buf_rec_size) {
kill_buf_rec_size += 64; kill_buf_rec_size += 64;
xrealloc ((kill_agent_args->slurm_addr), xrealloc ((kill_agent_args->slurm_addr),
...@@ -1577,7 +1572,9 @@ void msg_to_slurmd (slurm_msg_type_t msg_type) ...@@ -1577,7 +1572,9 @@ void msg_to_slurmd (slurm_msg_type_t msg_type)
strncpy (&kill_agent_args->node_names[pos], strncpy (&kill_agent_args->node_names[pos],
node_record_table_ptr[i].name, MAX_NAME_LEN); node_record_table_ptr[i].name, MAX_NAME_LEN);
kill_agent_args->node_count++; kill_agent_args->node_count++;
#ifdef HAVE_BGL
break; /* only done one front-end node */
#endif
} }
if (kill_agent_args->node_count == 0) if (kill_agent_args->node_count == 0)
......
...@@ -1408,6 +1408,10 @@ extern void re_kill_job(struct job_record *job_ptr) ...@@ -1408,6 +1408,10 @@ extern void re_kill_job(struct job_record *job_ptr)
if (node_ptr->node_state & NODE_STATE_NO_RESPOND) if (node_ptr->node_state & NODE_STATE_NO_RESPOND)
continue; continue;
(void) hostlist_push_host(kill_hostlist, node_ptr->name); (void) hostlist_push_host(kill_hostlist, node_ptr->name);
#ifdef HAVE_BGL
if (agent_args->node_count > 0)
continue; /* only do one front-end node */
#endif
if ((agent_args->node_count + 1) > buf_rec_size) { if ((agent_args->node_count + 1) > buf_rec_size) {
buf_rec_size += 128; buf_rec_size += 128;
xrealloc((agent_args->slurm_addr), xrealloc((agent_args->slurm_addr),
......
...@@ -177,7 +177,7 @@ void ping_nodes (void) ...@@ -177,7 +177,7 @@ void ping_nodes (void)
#ifdef HAVE_BGL #ifdef HAVE_BGL
if (i > 0) /* Only one front-end node to ping/register */ if (i > 0) /* Only one front-end node to ping/register */
break; continue;
#endif #endif
if (node_ptr->last_response == (time_t)0) { if (node_ptr->last_response == (time_t)0) {
......
...@@ -276,6 +276,9 @@ void signal_step_tasks(struct step_record *step_ptr, uint16_t signal) ...@@ -276,6 +276,9 @@ void signal_step_tasks(struct step_record *step_ptr, uint16_t signal)
node_names[MAX_NAME_LEN * agent_args->node_count], node_names[MAX_NAME_LEN * agent_args->node_count],
node_record_table_ptr[i].name, MAX_NAME_LEN); node_record_table_ptr[i].name, MAX_NAME_LEN);
agent_args->node_count++; agent_args->node_count++;
#ifdef HAVE_BGL
break; /* only do the one front-end node */
#endif
} }
if (agent_args->node_count == 0) { if (agent_args->node_count == 0) {
......
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