You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2015/09/25 00:05:32 UTC
[1/2] mesos git commit: Do not retry close on EINTR.
Repository: mesos
Updated Branches:
refs/heads/master ef78de1d9 -> 2c17e5642
Do not retry close on EINTR.
See: https://issues.apache.org/jira/browse/MESOS-3512
Review: https://reviews.apache.org/r/38729
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c76a35c7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c76a35c7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c76a35c7
Branch: refs/heads/master
Commit: c76a35c71d4e252f4d727ac1c94b2f1b8ec3985a
Parents: ef78de1
Author: Benjamin Mahler <be...@gmail.com>
Authored: Thu Sep 24 12:37:38 2015 -0700
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Thu Sep 24 14:47:39 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/subprocess.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c76a35c7/3rdparty/libprocess/src/subprocess.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/subprocess.cpp b/3rdparty/libprocess/src/subprocess.cpp
index d6ea62e..5ff7848 100644
--- a/3rdparty/libprocess/src/subprocess.cpp
+++ b/3rdparty/libprocess/src/subprocess.cpp
@@ -130,13 +130,13 @@ static int childMain(
{
// Close parent's end of the pipes.
if (in.isPipe()) {
- while (::close(stdinFd[1]) == -1 && errno == EINTR);
+ ::close(stdinFd[1]);
}
if (out.isPipe()) {
- while (::close(stdoutFd[0]) == -1 && errno == EINTR);
+ ::close(stdoutFd[0]);
}
if (err.isPipe()) {
- while (::close(stderrFd[0]) == -1 && errno == EINTR);
+ ::close(stderrFd[0]);
}
// Redirect I/O for stdin/stdout/stderr.
@@ -152,17 +152,17 @@ static int childMain(
if (stdinFd[0] != STDIN_FILENO &&
stdinFd[0] != STDOUT_FILENO &&
stdinFd[0] != STDERR_FILENO) {
- while (::close(stdinFd[0]) == -1 && errno == EINTR);
+ ::close(stdinFd[0]);
}
if (stdoutFd[1] != STDIN_FILENO &&
stdoutFd[1] != STDOUT_FILENO &&
stdoutFd[1] != STDERR_FILENO) {
- while (::close(stdoutFd[1]) == -1 && errno == EINTR);
+ ::close(stdoutFd[1]);
}
if (stderrFd[1] != STDIN_FILENO &&
stderrFd[1] != STDOUT_FILENO &&
stderrFd[1] != STDERR_FILENO) {
- while (::close(stderrFd[1]) == -1 && errno == EINTR);
+ ::close(stderrFd[1]);
}
if (setup.isSome()) {
[2/2] mesos git commit: Do not retry close on EINTR.
Posted by bm...@apache.org.
Do not retry close on EINTR.
See: https://issues.apache.org/jira/browse/MESOS-3512
Review: https://reviews.apache.org/r/38730
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2c17e564
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2c17e564
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2c17e564
Branch: refs/heads/master
Commit: 2c17e5642c1fa7373eca712e9e7fd2edcbaa8955
Parents: c76a35c
Author: Benjamin Mahler <be...@gmail.com>
Authored: Thu Sep 24 12:37:58 2015 -0700
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Thu Sep 24 14:47:40 2015 -0700
----------------------------------------------------------------------
src/slave/containerizer/linux_launcher.cpp | 4 ++--
src/tests/containerizer/isolator_tests.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2c17e564/src/slave/containerizer/linux_launcher.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/linux_launcher.cpp b/src/slave/containerizer/linux_launcher.cpp
index 6e266bd..c03b89e 100644
--- a/src/slave/containerizer/linux_launcher.cpp
+++ b/src/slave/containerizer/linux_launcher.cpp
@@ -275,7 +275,7 @@ static int childSetup(
const Option<lambda::function<int()>>& setup)
{
// In child.
- while (::close(pipes[1]) == -1 && errno == EINTR);
+ ::close(pipes[1]);
// Do a blocking read on the pipe until the parent signals us to
// continue.
@@ -288,7 +288,7 @@ static int childSetup(
ABORT("Failed to synchronize with parent");
}
- while (::close(pipes[0]) == -1 && errno == EINTR);
+ ::close(pipes[0]);
// Move to a different session (and new process group) so we're
// independent from the slave's session (otherwise children will
http://git-wip-us.apache.org/repos/asf/mesos/blob/2c17e564/src/tests/containerizer/isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/isolator_tests.cpp b/src/tests/containerizer/isolator_tests.cpp
index a25ae97..237f3f2 100644
--- a/src/tests/containerizer/isolator_tests.cpp
+++ b/src/tests/containerizer/isolator_tests.cpp
@@ -113,7 +113,7 @@ namespace tests {
static int childSetup(int pipes[2])
{
// In child process.
- while (::close(pipes[1]) == -1 && errno == EINTR);
+ ::close(pipes[1]);
// Wait until the parent signals us to continue.
char dummy;
@@ -125,7 +125,7 @@ static int childSetup(int pipes[2])
ABORT("Failed to synchronize with parent");
}
- while (::close(pipes[0]) == -1 && errno == EINTR);
+ ::close(pipes[0]);
return 0;
}