From ab9eb516532b7b6240822ddf1973b99e428d12d2 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 30 Oct 2013 15:56:15 -0700
Subject: [PATCH] Fix deadlock issue
---
src/plugins/proctrack/cgroup/proctrack_cgroup.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/proctrack/cgroup/proctrack_cgroup.c b/src/plugins/proctrack/cgroup/proctrack_cgroup.c
index 93b9df4e1a5..de863e048a0 100644
--- a/src/plugins/proctrack/cgroup/proctrack_cgroup.c
+++ b/src/plugins/proctrack/cgroup/proctrack_cgroup.c
@@ -268,8 +268,11 @@ int _slurm_cgroup_destroy(void)
xcgroup_lock(&slurm_freezer_cg);
if (jobstep_cgroup_path[0] != '\0') {
- if ( xcgroup_delete(&step_freezer_cg) != XCGROUP_SUCCESS )
+ if ( xcgroup_delete(&step_freezer_cg) != XCGROUP_SUCCESS ) {
+ if (slurm_freezer_init)
+ xcgroup_unlock(&slurm_freezer_cg);
return SLURM_ERROR;
+ }
xcgroup_destroy(&step_freezer_cg);
}
--
GitLab