mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gilb...@apache.org
Subject [mesos] 03/19: Fixed break of `port_mapping_tests.cpp`.
Date Wed, 10 Oct 2018 23:54:13 GMT
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 a64cf878163d9cc128b4e0b898267e07e69c720d
Author: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
AuthorDate: Thu Jun 14 09:45:34 2018 -0700

    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
    (cherry picked from commit 85adb1e8711325acb169239a2d9160e8f18f9579)
---
 src/tests/containerizer/port_mapping_tests.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 84b39b1..06dcce9 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;
   }


Mime
View raw message