Repository: mesos Updated Branches: refs/heads/master e3d75503c -> 0e2bb90cf
Fix executor passing STDIN pipe to health check. Previous fix for STDIN only fixes the health check command not passing in STDIN pipe by reading file STDIN. However the health check command is still getting STDIN piped as the command executor is creating a PIPE to STDIN when launching health check. To really fix this we need to also fix not passing anything to STDIN when launching health check. Review: https://reviews.apache.org/r/23518 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0e2bb90c Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0e2bb90c Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0e2bb90c Branch: refs/heads/master Commit: 0e2bb90cf4711c9783fff0d7f866f9a94863d27f Parents: e3d7550 Author: Timothy Chen <tnac...@apache.org> Authored: Tue Jul 15 13:17:27 2014 -0700 Committer: Benjamin Hindman <benjamin.hind...@gmail.com> Committed: Tue Jul 15 13:17:27 2014 -0700 ---------------------------------------------------------------------- src/launcher/executor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0e2bb90c/src/launcher/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp index 9c80848..a573637 100644 --- a/src/launcher/executor.cpp +++ b/src/launcher/executor.cpp @@ -421,7 +421,9 @@ private: process::subprocess( path::join(healthCheckDir, "mesos-health-check"), argv, - Subprocess::PIPE(), + // Intentionally not sending STDIN to avoid health check + // commands that expect STDIN input to block. + Subprocess::PATH("/dev/null"), Subprocess::FD(STDOUT_FILENO), Subprocess::FD(STDERR_FILENO));
