From eca089e3d3767ab7834cbbc75ad2c841148a8935 Mon Sep 17 00:00:00 2001
From: "Mark A. Grondona" <mgrondona@llnl.gov>
Date: Sat, 19 May 2012 06:55:11 -0700
Subject: [PATCH] slurmstepd: Close childfd of exec_wait_info in parent
Close the read end of the pipe slurmstepd uses to notify children
it is time to call exec(2) in order to save one file descriptor per
task. (Previously, the read side of the pipe wasn't closed until
exec_wait_info was destroyed)
---
src/slurmd/slurmstepd/mgr.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index dc8fdb19a73..359818221b4 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -1148,8 +1148,10 @@ static void exec_wait_info_destroy (struct exec_wait_info *e)
if (e == NULL)
return;
- close (e->parentfd);
- close (e->childfd);
+ if (e->parentfd >= 0)
+ close (e->parentfd);
+ if (e->childfd >= 0)
+ close (e->childfd);
e->id = -1;
e->pid = -1;
}
@@ -1172,9 +1174,17 @@ static struct exec_wait_info * fork_child_with_wait_info (int id)
exec_wait_info_destroy (e);
return (NULL);
}
- else if (e->pid == 0) /* In child, close parent fd */
+ /*
+ * Close parentfd in child, and childfd in parent:
+ */
+ if (e->pid == 0) {
close (e->parentfd);
-
+ e->parentfd = -1;
+ }
+ else {
+ close (e->childfd);
+ e->childfd = -1;
+ }
return (e);
}
--
GitLab