Skip to content

Commit

Permalink
Merge pull request flux-framework#6368 from garlick/issue#6366
Browse files Browse the repository at this point in the history
libsubprocess: ensure bulk-exec output is terminated
  • Loading branch information
mergify[bot] authored Oct 14, 2024
2 parents 50f8dc2 + df77f35 commit 2dbc16b
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions src/common/libsubprocess/bulk-exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,15 @@ static void exec_output_cb (flux_subprocess_t *p, const char *stream)
int rank = flux_subprocess_rank (p);
if (exec->handlers->on_output)
(*exec->handlers->on_output) (exec, p, stream, s, len, exec->arg);
else
flux_log (exec->h, LOG_INFO, "rank %d: %s: %s", rank, stream, s);
else {
flux_log (exec->h,
LOG_INFO,
"rank %d: %s: %.*s",
rank,
stream,
len,
s);
}
}
}

Expand Down Expand Up @@ -741,9 +748,10 @@ static void imp_kill_output (struct bulk_exec *kill,
int rank = flux_subprocess_rank (p);
flux_log (kill->h,
LOG_INFO,
"%s (rank %d): imp kill: %s",
"%s (rank %d): imp kill: %.*s",
flux_get_hostbyrank (kill->h, rank),
rank,
len,
data);
}

Expand Down

0 comments on commit 2dbc16b

Please sign in to comment.