From af9ea0a71bd05acef3fba328815ee9db7887eb8a Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 19 Apr 2017 16:35:51 -0600
Subject: [PATCH] Continuation of commit 24e2cb07e8e363
---
src/plugins/task/cgroup/task_cgroup_cpuset.c | 7 +++++++
src/plugins/task/cgroup/task_cgroup_devices.c | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/src/plugins/task/cgroup/task_cgroup_cpuset.c b/src/plugins/task/cgroup/task_cgroup_cpuset.c
index 449aaf55378..93c01c3f985 100644
--- a/src/plugins/task/cgroup/task_cgroup_cpuset.c
+++ b/src/plugins/task/cgroup/task_cgroup_cpuset.c
@@ -1107,6 +1107,13 @@ extern int task_cgroup_cpuset_fini(slurm_cgroup_conf_t *slurm_cgroup_conf)
xfree(pids);
} while ((i < npids) && (cnt < MAX_MOVE_WAIT));
+ if (cnt < MAX_MOVE_WAIT)
+ debug3("Took %d checks before stepd pid was removed from the step cgroup.",
+ cnt);
+ else
+ error("Pid %d is still in the step cgroup. It might be left uncleaned after the job.",
+ getpid());
+
if (xcgroup_delete(&step_cpuset_cg) != SLURM_SUCCESS)
debug2("task/cgroup: unable to remove step "
"cpuset : %m");
diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
index a3a3c6a6a77..6a09b3d52a7 100644
--- a/src/plugins/task/cgroup/task_cgroup_devices.c
+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
@@ -142,6 +142,13 @@ extern int task_cgroup_devices_fini(slurm_cgroup_conf_t *slurm_cgroup_conf)
xfree(pids);
} while ((i < npids) && (cnt < MAX_MOVE_WAIT));
+ if (cnt < MAX_MOVE_WAIT)
+ debug3("Took %d checks before stepd pid was removed from the step cgroup.",
+ cnt);
+ else
+ error("Pid %d is still in the step cgroup. It might be left uncleaned after the job.",
+ getpid());
+
if (xcgroup_delete(&step_devices_cg) != SLURM_SUCCESS)
debug2("task/cgroup: unable to remove step "
"devices : %m");
--
GitLab