You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/06/14 20:42:30 UTC
mesos git commit: Fixed break of `port_mapping_tests.cpp`.
Repository: mesos
Updated Branches:
refs/heads/master b13ef3160 -> 85adb1e87
Fixed break of `port_mapping_tests.cpp`.
The last change applied to the file descriptor whitelist chain removed
the default value from the new argument, and this function was not
updated. The other change made was that the three FD arguments were
turned into one `ContainerIO`. This was missed because this entire
isolator and its associated tests are not in the CMake build.
Review: https://reviews.apache.org/r/67600
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/85adb1e8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/85adb1e8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/85adb1e8
Branch: refs/heads/master
Commit: 85adb1e8711325acb169239a2d9160e8f18f9579
Parents: b13ef31
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Thu Jun 14 09:45:34 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Thu Jun 14 13:41:22 2018 -0700
----------------------------------------------------------------------
src/tests/containerizer/port_mapping_tests.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/85adb1e8/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 575ba46..553f530 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -35,8 +35,9 @@
#include <stout/stopwatch.hpp>
#include <stout/os/constants.hpp>
-#include <stout/os/stat.hpp>
#include <stout/os/exists.hpp>
+#include <stout/os/int_fd.hpp>
+#include <stout/os/stat.hpp>
#include "linux/fs.hpp"
#include "linux/ns.hpp"
@@ -346,13 +347,12 @@ protected:
containerId,
path::join(flags.launcher_dir, MESOS_CONTAINERIZER),
argv,
- Subprocess::FD(STDIN_FILENO),
- Subprocess::FD(STDOUT_FILENO),
- Subprocess::FD(STDERR_FILENO),
+ mesos::slave::ContainerIO(),
&launchFlags,
None(),
None(),
- CLONE_NEWNET | CLONE_NEWNS);
+ CLONE_NEWNET | CLONE_NEWNS,
+ vector<int_fd>());
return pid;
}