You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/03/29 07:03:58 UTC
[1/2] mesos git commit: Adapted port_mapping isolator with missing
subprocess parameter.
Repository: mesos
Updated Branches:
refs/heads/master 5a74c6ba4 -> b2cab0deb
Adapted port_mapping isolator with missing subprocess parameter.
Review: https://reviews.apache.org/r/45400/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e67ad670
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e67ad670
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e67ad670
Branch: refs/heads/master
Commit: e67ad670cd4db7ee7571576db047463c7dc60733
Parents: 5a74c6b
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Mon Mar 28 22:03:24 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Mar 28 22:03:32 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/network/port_mapping.cpp | 2 ++
src/tests/containerizer/port_mapping_tests.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e67ad670/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
index 134b6c7..323c84a 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
@@ -3034,6 +3034,7 @@ Future<Nothing> PortMappingIsolatorProcess::update(
Subprocess::PATH("/dev/null"),
Subprocess::FD(STDOUT_FILENO),
Subprocess::FD(STDERR_FILENO),
+ NO_SETSID,
update.flags);
if (s.isError()) {
@@ -3160,6 +3161,7 @@ Future<ResourceStatistics> PortMappingIsolatorProcess::usage(
Subprocess::PATH("/dev/null"),
Subprocess::PIPE(),
Subprocess::FD(STDERR_FILENO),
+ NO_SETSID,
statistics.flags);
if (s.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/e67ad670/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index de4b6f9..e062daa 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -342,7 +342,6 @@ protected:
Subprocess::FD(STDERR_FILENO),
launchFlags,
None(),
- None(),
CLONE_NEWNET | CLONE_NEWNS);
return pid;
@@ -374,6 +373,7 @@ protected:
Subprocess::PATH("/dev/null"),
Subprocess::PIPE(),
Subprocess::FD(STDERR_FILENO),
+ NO_SETSID,
statistics.flags);
CHECK_SOME(s);
[2/2] mesos git commit: Fixed typo in subprocess doxygen comments.
Posted by ji...@apache.org.
Fixed typo in subprocess doxygen comments.
Review: https://reviews.apache.org/r/45401/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b2cab0de
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b2cab0de
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b2cab0de
Branch: refs/heads/master
Commit: b2cab0deb285a91d1442df6ea2c8b54da1e59158
Parents: e67ad67
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Mon Mar 28 22:03:49 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Mar 28 22:03:49 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/include/process/subprocess.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b2cab0de/3rdparty/libprocess/include/process/subprocess.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/subprocess.hpp b/3rdparty/libprocess/include/process/subprocess.hpp
index da80664..2e29bed 100644
--- a/3rdparty/libprocess/include/process/subprocess.hpp
+++ b/3rdparty/libprocess/include/process/subprocess.hpp
@@ -299,7 +299,7 @@ private:
* before the child execs.
* @param working_directory Directory in which the process should
* chdir before exec after the 'parent_hooks' have been executed.
- * @param watchdog Indicator whether to new process should be monitored
+ * @param watchdog Indicator whether the new process should be monitored
* and killed if the parent process terminates.
* @return The subprocess or an error if one occured.
*/
@@ -344,7 +344,7 @@ Try<Subprocess> subprocess(
* before the child execs.
* @param working_directory Directory in which the process should
* chdir before exec after the 'parent_hooks' have been executed.
- * @param watchdog Indicator whether to new process should be monitored
+ * @param watchdog Indicator whether the new process should be monitored
* and killed if the parent process terminates.
* @return The subprocess or an error if one occured.
*/