Skip to content

Commit

Permalink
job-manager: don't use flux imp kill
Browse files Browse the repository at this point in the history
Problem: housekeeping and perilog use 'flux imp kill' to send
signals to housekeeping and prolog/epilog processes, but the
IMP will now forward signals and 'flux imp kill' is deprecated.

Don't call bulk_exec_set_imp_path() in housekeeping and perilog.

Fixes flux-framework#6409
  • Loading branch information
garlick committed Nov 4, 2024
1 parent cde68f9 commit 43312e3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
2 changes: 0 additions & 2 deletions src/modules/job-manager/housekeeping.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ static struct allocation *allocation_create (struct housekeeping *hk,
id,
"housekeeping",
a))
|| (hk->imp_path
&& bulk_exec_set_imp_path (a->bulk_exec, hk->imp_path) < 0)
|| update_cmd_env (hk->cmd, id, userid) < 0
|| bulk_exec_push_cmd (a->bulk_exec, a->pending, hk->cmd, 0) < 0) {
allocation_destroy (a);
Expand Down
9 changes: 0 additions & 9 deletions src/modules/job-manager/plugins/perilog.c
Original file line number Diff line number Diff line change
Expand Up @@ -827,15 +827,6 @@ static struct perilog_proc *procdesc_run (flux_t *h,
idf58 (id));
goto error;
}
/* If using IMP, push path to IMP into bulk_exec for IMP kill support:
*/
if (pd->uses_imp
&& bulk_exec_set_imp_path (bulk_exec, perilog_config.imp_path) < 0) {
flux_log_error (h,
"%s: failed to set IMP path",
perilog_proc_name (proc));
goto error;
}
if (bulk_exec_start (h, bulk_exec) < 0) {
flux_log_error (h, "%s: bulk_exec_start", perilog_proc_name (proc));
goto error;
Expand Down

0 comments on commit 43312e3

Please sign in to comment.