From 9253d267fdabc70fdf7c77c99f9034476f66ff4e Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Fri, 1 Nov 2024 11:00:56 -0700 Subject: [PATCH] job-manager: don't use flux imp kill 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 #6409 --- src/modules/job-manager/housekeeping.c | 2 -- src/modules/job-manager/plugins/perilog.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/src/modules/job-manager/housekeeping.c b/src/modules/job-manager/housekeeping.c index dde91f617ab0..9d1de0e4e5ae 100644 --- a/src/modules/job-manager/housekeeping.c +++ b/src/modules/job-manager/housekeeping.c @@ -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); diff --git a/src/modules/job-manager/plugins/perilog.c b/src/modules/job-manager/plugins/perilog.c index 4130cd27d05c..7f626870c44c 100644 --- a/src/modules/job-manager/plugins/perilog.c +++ b/src/modules/job-manager/plugins/perilog.c @@ -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;