Repository: mesos Updated Branches: refs/heads/master 0bef3e53a -> c8598f7f5
Pass user into Isolator::prepare. Review: https://reviews.apache.org/r/27557 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/529e288d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/529e288d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/529e288d Branch: refs/heads/master Commit: 529e288ddc219a4a8a28bad6c030a5e30b697f20 Parents: 0bef3e5 Author: Ian Downes <[email protected]> Authored: Mon Nov 3 12:04:43 2014 -0800 Committer: Ian Downes <[email protected]> Committed: Tue Nov 4 10:22:37 2014 -0800 ---------------------------------------------------------------------- src/slave/containerizer/isolator.cpp | 6 +++-- src/slave/containerizer/isolator.hpp | 6 +++-- .../isolators/cgroups/cpushare.cpp | 3 ++- .../isolators/cgroups/cpushare.hpp | 3 ++- .../containerizer/isolators/cgroups/mem.cpp | 3 ++- .../containerizer/isolators/cgroups/mem.hpp | 3 ++- .../isolators/cgroups/perf_event.cpp | 3 ++- .../isolators/cgroups/perf_event.hpp | 3 ++- .../isolators/filesystem/shared.cpp | 3 ++- .../isolators/filesystem/shared.hpp | 3 ++- .../containerizer/isolators/namespaces/pid.cpp | 3 ++- .../containerizer/isolators/namespaces/pid.hpp | 3 ++- .../isolators/network/port_mapping.cpp | 3 ++- .../isolators/network/port_mapping.hpp | 3 ++- src/slave/containerizer/isolators/posix.hpp | 3 ++- src/slave/containerizer/mesos/containerizer.cpp | 4 ++- src/tests/isolator.hpp | 3 ++- src/tests/isolator_tests.cpp | 22 +++++++++------ src/tests/port_mapping_tests.cpp | 28 ++++++++++---------- 19 files changed, 67 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolator.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolator.cpp b/src/slave/containerizer/isolator.cpp index 69849d2..90a47c4 100644 --- a/src/slave/containerizer/isolator.cpp +++ b/src/slave/containerizer/isolator.cpp @@ -53,13 +53,15 @@ Future<Nothing> Isolator::recover(const list<state::RunState>& state) Future<Option<CommandInfo> > Isolator::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const string& directory) + const string& directory, + const Option<string>& user) { return dispatch(process.get(), &IsolatorProcess::prepare, containerId, executorInfo, - directory); + directory, + user); } http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolator.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolator.hpp b/src/slave/containerizer/isolator.hpp index 4c9d1d8..bdcf7a9 100644 --- a/src/slave/containerizer/isolator.hpp +++ b/src/slave/containerizer/isolator.hpp @@ -78,7 +78,8 @@ public: process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory); + const std::string& directory, + const Option<std::string>& user); // Isolate the executor. process::Future<Nothing> isolate( @@ -121,7 +122,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory) = 0; + const std::string& directory, + const Option<std::string>& user) = 0; virtual process::Future<Nothing> isolate( const ContainerID& containerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/cgroups/cpushare.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/isolators/cgroups/cpushare.cpp index f9531e4..dbf6130 100644 --- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp +++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp @@ -250,7 +250,8 @@ Future<Nothing> CgroupsCpushareIsolatorProcess::recover( Future<Option<CommandInfo> > CgroupsCpushareIsolatorProcess::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const string& directory) + const string& directory, + const Option<string>& user) { if (infos.contains(containerId)) { return Failure("Container has already been prepared"); http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/cgroups/cpushare.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.hpp b/src/slave/containerizer/isolators/cgroups/cpushare.hpp index 5d43169..4ded0c4 100644 --- a/src/slave/containerizer/isolators/cgroups/cpushare.hpp +++ b/src/slave/containerizer/isolators/cgroups/cpushare.hpp @@ -48,7 +48,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory); + const std::string& directory, + const Option<std::string>& user); virtual process::Future<Nothing> isolate( const ContainerID& containerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/cgroups/mem.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp index 96bc506..abdc436 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.cpp +++ b/src/slave/containerizer/isolators/cgroups/mem.cpp @@ -205,7 +205,8 @@ Future<Nothing> CgroupsMemIsolatorProcess::recover( Future<Option<CommandInfo> > CgroupsMemIsolatorProcess::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const string& directory) + const string& directory, + const Option<string>& user) { if (infos.contains(containerId)) { return Failure("Container has already been prepared"); http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/cgroups/mem.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/mem.hpp b/src/slave/containerizer/isolators/cgroups/mem.hpp index 25e4afc..2fa7555 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.hpp +++ b/src/slave/containerizer/isolators/cgroups/mem.hpp @@ -42,7 +42,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory); + const std::string& directory, + const Option<std::string>& user); virtual process::Future<Nothing> isolate( const ContainerID& containerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/cgroups/perf_event.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/perf_event.cpp b/src/slave/containerizer/isolators/cgroups/perf_event.cpp index 7ed418a..d6837de 100644 --- a/src/slave/containerizer/isolators/cgroups/perf_event.cpp +++ b/src/slave/containerizer/isolators/cgroups/perf_event.cpp @@ -214,7 +214,8 @@ Future<Nothing> CgroupsPerfEventIsolatorProcess::recover( Future<Option<CommandInfo> > CgroupsPerfEventIsolatorProcess::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const string& directory) + const string& directory, + const Option<string>& user) { if (infos.contains(containerId)) { return Failure("Container has already been prepared"); http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/cgroups/perf_event.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/perf_event.hpp b/src/slave/containerizer/isolators/cgroups/perf_event.hpp index 7cb2ba2..e511c3e 100644 --- a/src/slave/containerizer/isolators/cgroups/perf_event.hpp +++ b/src/slave/containerizer/isolators/cgroups/perf_event.hpp @@ -46,7 +46,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory); + const std::string& directory, + const Option<std::string>& user); virtual process::Future<Nothing> isolate( const ContainerID& containerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/filesystem/shared.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/filesystem/shared.cpp b/src/slave/containerizer/isolators/filesystem/shared.cpp index 49510b2..5c347af 100644 --- a/src/slave/containerizer/isolators/filesystem/shared.cpp +++ b/src/slave/containerizer/isolators/filesystem/shared.cpp @@ -69,7 +69,8 @@ Future<Nothing> SharedFilesystemIsolatorProcess::recover( Future<Option<CommandInfo> > SharedFilesystemIsolatorProcess::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const string& directory) + const string& directory, + const Option<string>& user) { if (executorInfo.has_container() && executorInfo.container().type() != ContainerInfo::MESOS) { http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/filesystem/shared.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/filesystem/shared.hpp b/src/slave/containerizer/isolators/filesystem/shared.hpp index 75172d5..727f63e 100644 --- a/src/slave/containerizer/isolators/filesystem/shared.hpp +++ b/src/slave/containerizer/isolators/filesystem/shared.hpp @@ -43,7 +43,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory); + const std::string& directory, + const Option<std::string>& user); virtual process::Future<Nothing> isolate( const ContainerID& containerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/namespaces/pid.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/namespaces/pid.cpp b/src/slave/containerizer/isolators/namespaces/pid.cpp index edfb1f6..fdd430e 100644 --- a/src/slave/containerizer/isolators/namespaces/pid.cpp +++ b/src/slave/containerizer/isolators/namespaces/pid.cpp @@ -155,7 +155,8 @@ Future<Nothing> NamespacesPidIsolatorProcess::recover( Future<Option<CommandInfo> > NamespacesPidIsolatorProcess::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const string& directory) + const string& directory, + const Option<string>& user) { list<string> commands; http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/namespaces/pid.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/namespaces/pid.hpp b/src/slave/containerizer/isolators/namespaces/pid.hpp index 7c40e77..8da6ccc 100644 --- a/src/slave/containerizer/isolators/namespaces/pid.hpp +++ b/src/slave/containerizer/isolators/namespaces/pid.hpp @@ -60,7 +60,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory); + const std::string& directory, + const Option<std::string>& user); virtual process::Future<Nothing> isolate( const ContainerID& containerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/network/port_mapping.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp index 14fae1f..8436bf7 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -1438,7 +1438,8 @@ PortMappingIsolatorProcess::_recover(pid_t pid) Future<Option<CommandInfo> > PortMappingIsolatorProcess::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const string& directory) + const string& directory, + const Option<string>& user) { if (unmanaged.contains(containerId)) { return Failure("Asked to prepare an unmanaged container"); http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/network/port_mapping.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.hpp b/src/slave/containerizer/isolators/network/port_mapping.hpp index f9215b2..f1e2352 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.hpp +++ b/src/slave/containerizer/isolators/network/port_mapping.hpp @@ -135,7 +135,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory); + const std::string& directory, + const Option<std::string>& user); virtual process::Future<Nothing> isolate( const ContainerID& containerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/isolators/posix.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/posix.hpp b/src/slave/containerizer/isolators/posix.hpp index 7e02f92..7a667e3 100644 --- a/src/slave/containerizer/isolators/posix.hpp +++ b/src/slave/containerizer/isolators/posix.hpp @@ -70,7 +70,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory) + const std::string& directory, + const Option<std::string>& user) { if (promises.contains(containerId)) { return process::Failure("Container " + stringify(containerId) + http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/slave/containerizer/mesos/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index d4b08f5..4bd2665 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -483,10 +483,11 @@ static Future<list<Option<CommandInfo>>> _prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, const string& directory, + const Option<string>& user, const list<Option<CommandInfo>> commands) { // Propagate any failure. - return isolator->prepare(containerId, executorInfo, directory) + return isolator->prepare(containerId, executorInfo, directory, user) .then(lambda::bind(&accumulate, commands, lambda::_1)); } @@ -509,6 +510,7 @@ Future<list<Option<CommandInfo>>> MesosContainerizerProcess::prepare( containerId, executorInfo, directory, + user, lambda::_1)); } http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/tests/isolator.hpp ---------------------------------------------------------------------- diff --git a/src/tests/isolator.hpp b/src/tests/isolator.hpp index d8f3f09..2c3a694 100644 --- a/src/tests/isolator.hpp +++ b/src/tests/isolator.hpp @@ -46,7 +46,8 @@ public: virtual process::Future<Option<CommandInfo> > prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, - const std::string& directory) + const std::string& directory, + const Option<std::string>& user) { return commandInfo; } http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/tests/isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/isolator_tests.cpp b/src/tests/isolator_tests.cpp index 4d03f46..6b49a9e 100644 --- a/src/tests/isolator_tests.cpp +++ b/src/tests/isolator_tests.cpp @@ -162,7 +162,8 @@ TYPED_TEST(CpuIsolatorTest, UserCpuUsage) Try<string> dir = os::mkdtemp(path::join(os::getcwd(), "XXXXXX")); ASSERT_SOME(dir); - AWAIT_READY(isolator.get()->prepare(containerId, executorInfo, dir.get())); + AWAIT_READY( + isolator.get()->prepare(containerId, executorInfo, dir.get(), None())); const string& file = path::join(dir.get(), "mesos_isolator_test_ready"); @@ -267,7 +268,8 @@ TYPED_TEST(CpuIsolatorTest, SystemCpuUsage) Try<string> dir = os::mkdtemp(path::join(os::getcwd(), "XXXXXX")); ASSERT_SOME(dir); - AWAIT_READY(isolator.get()->prepare(containerId, executorInfo, dir.get())); + AWAIT_READY( + isolator.get()->prepare(containerId, executorInfo, dir.get(), None())); const string& file = path::join(dir.get(), "mesos_isolator_test_ready"); @@ -380,7 +382,8 @@ TEST_F(LimitedCpuIsolatorTest, ROOT_CGROUPS_Cfs) Try<string> dir = os::mkdtemp(path::join(os::getcwd(), "XXXXXX")); ASSERT_SOME(dir); - AWAIT_READY(isolator.get()->prepare(containerId, executorInfo, dir.get())); + AWAIT_READY( + isolator.get()->prepare(containerId, executorInfo, dir.get(), None())); // Generate random numbers to max out a single core. We'll run this for 0.5 // seconds of wall time so it should consume approximately 250 ms of total @@ -486,7 +489,8 @@ TEST_F(LimitedCpuIsolatorTest, ROOT_CGROUPS_Cfs_Big_Quota) Try<string> dir = os::mkdtemp(path::join(os::getcwd(), "XXXXXX")); ASSERT_SOME(dir); - AWAIT_READY(isolator.get()->prepare(containerId, executorInfo, dir.get())); + AWAIT_READY( + isolator.get()->prepare(containerId, executorInfo, dir.get(), None())); int pipes[2]; ASSERT_NE(-1, ::pipe(pipes)); @@ -620,7 +624,8 @@ TYPED_TEST(MemIsolatorTest, MemUsage) Try<string> dir = os::mkdtemp(path::join(os::getcwd(), "XXXXXX")); ASSERT_SOME(dir); - AWAIT_READY(isolator.get()->prepare(containerId, executorInfo, dir.get())); + AWAIT_READY( + isolator.get()->prepare(containerId, executorInfo, dir.get(), None())); int pipes[2]; ASSERT_NE(-1, ::pipe(pipes)); @@ -712,7 +717,8 @@ TEST_F(PerfEventIsolatorTest, ROOT_CGROUPS_Sample) Try<string> dir = os::mkdtemp(path::join(os::getcwd(), "XXXXXX")); ASSERT_SOME(dir); - AWAIT_READY(isolator.get()->prepare(containerId, executorInfo, dir.get())); + AWAIT_READY( + isolator.get()->prepare(containerId, executorInfo, dir.get(), None())); // This first sample is likely to be empty because perf hasn't // completed yet but we should still have the required fields. @@ -798,7 +804,7 @@ TEST_F(SharedFilesystemIsolatorTest, ROOT_RelativeVolume) containerId.set_value(UUID::random().toString()); Future<Option<CommandInfo> > prepare = - isolator.get()->prepare(containerId, executorInfo, flags.work_dir); + isolator.get()->prepare(containerId, executorInfo, flags.work_dir, None()); AWAIT_READY(prepare); ASSERT_SOME(prepare.get()); @@ -890,7 +896,7 @@ TEST_F(SharedFilesystemIsolatorTest, ROOT_AbsoluteVolume) containerId.set_value(UUID::random().toString()); Future<Option<CommandInfo> > prepare = - isolator.get()->prepare(containerId, executorInfo, flags.work_dir); + isolator.get()->prepare(containerId, executorInfo, flags.work_dir, None()); AWAIT_READY(prepare); ASSERT_SOME(prepare.get()); http://git-wip-us.apache.org/repos/asf/mesos/blob/529e288d/src/tests/port_mapping_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/port_mapping_tests.cpp b/src/tests/port_mapping_tests.cpp index 1a5e52c..0af695b 100644 --- a/src/tests/port_mapping_tests.cpp +++ b/src/tests/port_mapping_tests.cpp @@ -363,7 +363,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerToContainerTCPTest) ASSERT_SOME(dir1); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId1, executorInfo, dir1.get()); + isolator.get()->prepare(containerId1, executorInfo, dir1.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -422,7 +422,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerToContainerTCPTest) ASSERT_SOME(dir2); Future<Option<CommandInfo> > preparation2 = - isolator.get()->prepare(containerId2, executorInfo, dir2.get()); + isolator.get()->prepare(containerId2, executorInfo, dir2.get(), None()); AWAIT_READY(preparation2); ASSERT_SOME(preparation2.get()); @@ -510,7 +510,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerToContainerUDPTest) ASSERT_SOME(dir1); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId1, executorInfo, dir1.get()); + isolator.get()->prepare(containerId1, executorInfo, dir1.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -570,7 +570,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerToContainerUDPTest) ASSERT_SOME(dir2); Future<Option<CommandInfo> > preparation2 = - isolator.get()->prepare(containerId2, executorInfo, dir2.get()); + isolator.get()->prepare(containerId2, executorInfo, dir2.get(), None()); AWAIT_READY(preparation2); ASSERT_SOME(preparation2.get()); @@ -658,7 +658,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_HostToContainerUDPTest) ASSERT_SOME(dir); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir.get()); + isolator.get()->prepare(containerId, executorInfo, dir.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -772,7 +772,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_HostToContainerTCPTest) ASSERT_SOME(dir); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir.get()); + isolator.get()->prepare(containerId, executorInfo, dir.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -893,7 +893,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPExternalTest) ASSERT_SOME(dir); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir.get()); + isolator.get()->prepare(containerId, executorInfo, dir.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -971,7 +971,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPInternalTest) ASSERT_SOME(dir); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir.get()); + isolator.get()->prepare(containerId, executorInfo, dir.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -1053,7 +1053,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerARPExternalTest) ASSERT_SOME(dir); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir.get()); + isolator.get()->prepare(containerId, executorInfo, dir.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -1140,7 +1140,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_DNSTest) ASSERT_SOME(dir); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir.get()); + isolator.get()->prepare(containerId, executorInfo, dir.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -1223,7 +1223,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainersTest) ASSERT_SOME(dir1); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId1, executorInfo, dir1.get()); + isolator.get()->prepare(containerId1, executorInfo, dir1.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -1267,7 +1267,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainersTest) ASSERT_SOME(dir2); Future<Option<CommandInfo> > preparation2 = - isolator.get()->prepare(containerId2, executorInfo, dir2.get()); + isolator.get()->prepare(containerId2, executorInfo, dir2.get(), None()); AWAIT_FAILED(preparation2); // Ensure all processes are killed. @@ -1325,7 +1325,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_SmallEgressLimitTest) ASSERT_SOME(dir); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir.get()); + isolator.get()->prepare(containerId, executorInfo, dir.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get()); @@ -1446,7 +1446,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ExportRTTTest) ASSERT_SOME(dir1); Future<Option<CommandInfo> > preparation1 = - isolator.get()->prepare(containerId, executorInfo, dir1.get()); + isolator.get()->prepare(containerId, executorInfo, dir1.get(), None()); AWAIT_READY(preparation1); ASSERT_SOME(preparation1.get());
