You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2018/10/10 23:54:18 UTC
[mesos] 08/19: Fixed Windows build break.
This is an automated email from the ASF dual-hosted git repository.
gilbert pushed a commit to branch 1.4.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit b871d1a74eef827de6d4920d581e72b6b7bba6bf
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
AuthorDate: Fri Aug 17 17:10:44 2018 -0700
Fixed Windows build break.
The `SETSID()` and `UNSET_CLOEXEC()` child hooks do not exist on
Windows (in fact, no child hooks exist on Windows).
(cherry picked from commit 0ac5af21d7d2408b91e877b163c8c70b6ef81438)
---
src/slave/containerizer/mesos/launcher.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/slave/containerizer/mesos/launcher.cpp b/src/slave/containerizer/mesos/launcher.cpp
index 1cdd043..aa594ec 100644
--- a/src/slave/containerizer/mesos/launcher.cpp
+++ b/src/slave/containerizer/mesos/launcher.cpp
@@ -122,12 +122,14 @@ Try<pid_t> SubprocessLauncher::fork(
vector<Subprocess::ChildHook> childHooks;
+#ifndef __WINDOWS__
childHooks.push_back(Subprocess::ChildHook::SETSID());
// TODO(jpeach) libprocess should take care of this, see MESOS-9164.
foreach (int_fd fd, whitelistFds) {
childHooks.push_back(Subprocess::ChildHook::UNSET_CLOEXEC(fd));
}
+#endif // __WINDOWS__
Try<Subprocess> child = subprocess(
path,