Updated all tests that use Containerizer::launch(...). This sweeps through the unit tests and translates all existing tests that use the two variants of Containerizer::launch(...) (i.e. nested and non-nested) and translates the arguments to the new interface. Some of the fetcher interface changes are also addressed in this sweep.
Review: https://reviews.apache.org/r/59074 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/74c61ceb Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/74c61ceb Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/74c61ceb Branch: refs/heads/master Commit: 74c61cebacb0c24e0a16a708d7ba958b29aeebf3 Parents: 391ced5 Author: Joseph Wu <josep...@apache.org> Authored: Thu May 4 16:56:56 2017 -0700 Committer: Joseph Wu <josep...@apache.org> Committed: Thu May 25 18:37:08 2017 -0700 ---------------------------------------------------------------------- src/tests/api_tests.cpp | 16 +-- src/tests/check_tests.cpp | 12 +- src/tests/command_executor_tests.cpp | 2 +- src/tests/container_logger_tests.cpp | 10 +- .../containerizer/cgroups_isolator_tests.cpp | 20 +-- src/tests/containerizer/cni_isolator_tests.cpp | 2 +- .../composing_containerizer_tests.cpp | 34 ++--- src/tests/containerizer/cpu_isolator_tests.cpp | 4 +- .../docker_volume_isolator_tests.cpp | 6 +- .../environment_secret_isolator_tests.cpp | 2 +- src/tests/containerizer/isolator_tests.cpp | 28 ++--- .../linux_filesystem_isolator_tests.cpp | 126 ++++++++----------- .../containerizer/memory_isolator_tests.cpp | 2 +- .../containerizer/memory_pressure_tests.cpp | 4 +- src/tests/containerizer/port_mapping_tests.cpp | 10 +- .../volume_image_isolator_tests.cpp | 35 +++--- .../volume_secret_isolator_tests.cpp | 17 +-- src/tests/containerizer/xfs_quota_tests.cpp | 13 +- src/tests/disk_quota_tests.cpp | 6 +- src/tests/health_check_tests.cpp | 22 ++-- src/tests/hook_tests.cpp | 28 ++--- src/tests/master_tests.cpp | 4 +- src/tests/slave_recovery_tests.cpp | 68 +++++----- src/tests/slave_tests.cpp | 40 +++--- 24 files changed, 233 insertions(+), 278 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp index faf3242..97a8cc9 100644 --- a/src/tests/api_tests.cpp +++ b/src/tests/api_tests.cpp @@ -3623,7 +3623,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, NestedContainerLaunchFalse) { // Return false here to indicate "unsupported". - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(Return(Future<bool>(false))); v1::agent::Call call; @@ -4055,7 +4055,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, LaunchNestedContainerSession) ASSERT_SOME(master); slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -4167,7 +4167,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_SOME(master); slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> mesosContainerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -4272,7 +4272,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_SOME(master); slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -4389,7 +4389,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_SOME(master); slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -4693,7 +4693,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( acl->mutable_users()->set_type(mesos::ACL::Entity::NONE); } - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -5056,7 +5056,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPIStreamingTest, ASSERT_SOME(master); slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -5300,7 +5300,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_SOME(master); slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/check_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/check_tests.cpp b/src/tests/check_tests.cpp index 68aa29a..d85d1c3 100644 --- a/src/tests/check_tests.cpp +++ b/src/tests/check_tests.cpp @@ -1311,7 +1311,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); // We have to explicitly create a `Containerizer` in non-local mode, // because `LaunchNestedContainerSession` (used by command checks) @@ -1505,7 +1505,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); // We have to explicitly create a `Containerizer` in non-local mode, // because `LaunchNestedContainerSession` (used by command checks) @@ -1666,7 +1666,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); // We have to explicitly create a `Containerizer` in non-local mode, // because `LaunchNestedContainerSession` (used by command checks) @@ -1811,7 +1811,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); // We have to explicitly create a `Containerizer` in non-local mode, // because `LaunchNestedContainerSession` (used by command checks) @@ -1979,7 +1979,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, CommandCheckTimeout) slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); // We have to explicitly create a `Containerizer` in non-local mode, // because `LaunchNestedContainerSession` (used by command checks) @@ -2127,7 +2127,7 @@ TEST_F(DefaultExecutorCheckTest, CommandCheckAndHealthCheckNoShadowing) slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); // We have to explicitly create a `Containerizer` in non-local mode, // because `LaunchNestedContainerSession` (used by command checks) http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/command_executor_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/command_executor_tests.cpp b/src/tests/command_executor_tests.cpp index da4b653..382606a 100644 --- a/src/tests/command_executor_tests.cpp +++ b/src/tests/command_executor_tests.cpp @@ -353,7 +353,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HTTPCommandExecutorTest, TerminateWithACK) slave::Flags flags = CreateSlaveFlags(); flags.http_command_executor = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/container_logger_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/container_logger_tests.cpp b/src/tests/container_logger_tests.cpp index 28436b6..2ebff80 100644 --- a/src/tests/container_logger_tests.cpp +++ b/src/tests/container_logger_tests.cpp @@ -147,7 +147,7 @@ TEST_F(ContainerLoggerTest, DefaultToSandbox) // We'll need access to these flags later. slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); // We use an actual containerizer + executor since we want something to run. Try<MesosContainerizer*> _containerizer = @@ -248,7 +248,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_RotateInSandbox) // Use the non-default container logger that rotates logs. flags.container_logger = LOGROTATE_CONTAINER_LOGGER_NAME; - Fetcher fetcher; + Fetcher fetcher(flags); // We use an actual containerizer + executor since we want something to run. Try<MesosContainerizer*> _containerizer = @@ -398,7 +398,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions) // Use the non-default container logger that rotates logs. flags.container_logger = LOGROTATE_CONTAINER_LOGGER_NAME; - Fetcher fetcher; + Fetcher fetcher(flags); // We use an actual containerizer + executor since we want something to run. Try<MesosContainerizer*> _containerizer = @@ -505,7 +505,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_ModuleFDOwnership) // Use the non-default container logger that rotates logs. flags.container_logger = LOGROTATE_CONTAINER_LOGGER_NAME; - Fetcher fetcher; + Fetcher fetcher(flags); // We use an actual containerizer + executor since we want something to run. Try<MesosContainerizer*> _containerizer = @@ -629,7 +629,7 @@ TEST_P(UserContainerLoggerTest, ROOT_LOGROTATE_RotateWithSwitchUserTrueOrFalse) flags.work_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); ASSERT_SOME(chmod); - Fetcher fetcher; + Fetcher fetcher(flags); // We use an actual containerizer + executor since we want something to run. Try<MesosContainerizer*> _containerizer = http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/cgroups_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp b/src/tests/containerizer/cgroups_isolator_tests.cpp index 4e1d027..6724211 100644 --- a/src/tests/containerizer/cgroups_isolator_tests.cpp +++ b/src/tests/containerizer/cgroups_isolator_tests.cpp @@ -119,7 +119,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_NET_CLS_UserCgroup) "docker/runtime," "filesystem/linux"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -244,7 +244,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "cgroups/cpu"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -359,7 +359,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_CFS_EnableCfs) // Enable CFS to cap CPU utilization. flags.cgroups_enable_cfs = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -568,7 +568,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PidsAndTids) flags.isolation = "cgroups/cpu"; flags.cgroups_cpu_enable_pids_and_tids_count = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -753,7 +753,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_Isolate) flags.cgroups_net_cls_primary_handle = stringify(primary); flags.cgroups_net_cls_secondary_handles = "0xffff,0xffff"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -880,7 +880,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_ContainerStatus) flags.cgroups_net_cls_primary_handle = stringify(0x0012); flags.cgroups_net_cls_secondary_handles = "0x0011,0x0012"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -976,7 +976,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_Sample) flags.perf_interval = Milliseconds(500); flags.isolation = "cgroups/perf_event"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -1087,7 +1087,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_PerfForward) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "cgroups/cpu,cgroups/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -1248,7 +1248,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryForward) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "cgroups/cpu"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -1404,7 +1404,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryBackward) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "cgroups/cpu,cgroups/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/cni_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/cni_isolator_tests.cpp b/src/tests/containerizer/cni_isolator_tests.cpp index 565e58a..3a5f4eb 100644 --- a/src/tests/containerizer/cni_isolator_tests.cpp +++ b/src/tests/containerizer/cni_isolator_tests.cpp @@ -289,7 +289,7 @@ TEST_F(CniIsolatorTest, ROOT_VerifyCheckpointedInfo) flags.network_cni_plugins_dir = cniPluginDir; flags.network_cni_config_dir = cniConfigDir; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/composing_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/composing_containerizer_tests.cpp b/src/tests/containerizer/composing_containerizer_tests.cpp index d7fd621..61e47e9 100644 --- a/src/tests/containerizer/composing_containerizer_tests.cpp +++ b/src/tests/containerizer/composing_containerizer_tests.cpp @@ -85,7 +85,7 @@ TEST_F(ComposingContainerizerTest, DestroyDuringUnsupportedLaunchLoop) Promise<bool> launchPromise; - EXPECT_CALL(*mockContainerizer1, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*mockContainerizer1, launch(_, _, _, _)) .WillOnce(Return(launchPromise.future())); Future<Nothing> destroy; @@ -96,13 +96,9 @@ TEST_F(ComposingContainerizerTest, DestroyDuringUnsupportedLaunchLoop) Future<bool> launched = containerizer.launch( containerId, - taskInfo, - executorInfo, - "dir", - "user", - slaveId, + createContainerConfig(taskInfo, executorInfo, "dir", "user"), environment, - false); + None()); Resources resources = Resources::parse("cpus:1;mem:256").get(); @@ -110,7 +106,7 @@ TEST_F(ComposingContainerizerTest, DestroyDuringUnsupportedLaunchLoop) Future<bool> destroyed = containerizer.destroy(containerId); - EXPECT_CALL(*mockContainerizer2, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*mockContainerizer2, launch(_, _, _, _)) .Times(0); // We make sure the destroy is being called on the first containerizer. @@ -155,7 +151,7 @@ TEST_F(ComposingContainerizerTest, DestroyDuringSupportedLaunchLoop) Promise<bool> launchPromise; - EXPECT_CALL(*mockContainerizer1, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*mockContainerizer1, launch(_, _, _, _)) .WillOnce(Return(launchPromise.future())); Future<Nothing> destroy; @@ -166,13 +162,9 @@ TEST_F(ComposingContainerizerTest, DestroyDuringSupportedLaunchLoop) Future<bool> launched = containerizer.launch( containerId, - taskInfo, - executorInfo, - "dir", - "user", - slaveId, + createContainerConfig(taskInfo, executorInfo, "dir", "user"), environment, - false); + None()); Resources resources = Resources::parse("cpus:1;mem:256").get(); @@ -180,7 +172,7 @@ TEST_F(ComposingContainerizerTest, DestroyDuringSupportedLaunchLoop) Future<bool> destroyed = containerizer.destroy(containerId); - EXPECT_CALL(*mockContainerizer2, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*mockContainerizer2, launch(_, _, _, _)) .Times(0); // We make sure the destroy is being called on the first containerizer. @@ -221,7 +213,7 @@ TEST_F(ComposingContainerizerTest, DestroyAfterLaunchLoop) Promise<bool> launchPromise; - EXPECT_CALL(*mockContainerizer1, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*mockContainerizer1, launch(_, _, _, _)) .WillOnce(Return(launchPromise.future())); Future<Nothing> destroy; @@ -232,13 +224,9 @@ TEST_F(ComposingContainerizerTest, DestroyAfterLaunchLoop) Future<bool> launched = containerizer.launch( containerId, - taskInfo, - executorInfo, - "dir", - "user", - slaveId, + createContainerConfig(taskInfo, executorInfo, "dir", "user"), environment, - false); + None()); Resources resources = Resources::parse("cpus:1;mem:256").get(); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/cpu_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/cpu_isolator_tests.cpp b/src/tests/containerizer/cpu_isolator_tests.cpp index 3c6f748..0e86318 100644 --- a/src/tests/containerizer/cpu_isolator_tests.cpp +++ b/src/tests/containerizer/cpu_isolator_tests.cpp @@ -72,7 +72,7 @@ TEST_P(CpuIsolatorTest, ROOT_UserCpuUsage) slave::Flags flags = CreateSlaveFlags(); flags.isolation = GetParam(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -163,7 +163,7 @@ TEST_P(CpuIsolatorTest, ROOT_SystemCpuUsage) slave::Flags flags = CreateSlaveFlags(); flags.isolation = GetParam(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/docker_volume_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/docker_volume_isolator_tests.cpp b/src/tests/containerizer/docker_volume_isolator_tests.cpp index b47a6b5..866af61 100644 --- a/src/tests/containerizer/docker_volume_isolator_tests.cpp +++ b/src/tests/containerizer/docker_volume_isolator_tests.cpp @@ -151,6 +151,8 @@ protected: const slave::Flags& flags, const Owned<DriverClient>& mockClient) { + fetcher.reset(new Fetcher(flags)); + Try<Isolator*> linuxIsolator_ = LinuxFilesystemIsolatorProcess::create(flags); @@ -199,7 +201,7 @@ protected: Try<MesosContainerizer*> containerizer = MesosContainerizer::create( flags, true, - &fetcher, + fetcher.get(), std::move(launcher), provisioner->share(), {std::move(linuxIsolator), @@ -214,7 +216,7 @@ protected: } private: - Fetcher fetcher; + Owned<Fetcher> fetcher; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/environment_secret_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/environment_secret_isolator_tests.cpp b/src/tests/containerizer/environment_secret_isolator_tests.cpp index 6190040..b034cee 100644 --- a/src/tests/containerizer/environment_secret_isolator_tests.cpp +++ b/src/tests/containerizer/environment_secret_isolator_tests.cpp @@ -54,7 +54,7 @@ TEST_F(EnvironmentSecretIsolatorTest, ResolveSecret) mesos::internal::slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<SecretResolver*> secretResolver = SecretResolver::create(); EXPECT_SOME(secretResolver); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/isolator_tests.cpp b/src/tests/containerizer/isolator_tests.cpp index 355e15f..f3c541c 100644 --- a/src/tests/containerizer/isolator_tests.cpp +++ b/src/tests/containerizer/isolator_tests.cpp @@ -71,8 +71,10 @@ public: slave::Flags flags = CreateSlaveFlags(); flags.isolation = isolation; + fetcher.reset(new Fetcher(flags)); + Try<MesosContainerizer*> _containerizer = - MesosContainerizer::create(flags, false, &fetcher); + MesosContainerizer::create(flags, false, fetcher.get()); if (_containerizer.isError()) { return Error(_containerizer.error()); @@ -94,7 +96,7 @@ public: } string directory; - Fetcher fetcher; + Owned<Fetcher> fetcher; ContainerID containerId; }; @@ -111,13 +113,12 @@ TEST_F(NamespacesIsolatorTest, ROOT_PidNamespace) process::Future<bool> launch = containerizer.get()->launch( containerId, - None(), - createExecutorInfo("executor", command), - directory, - None(), - SlaveID(), + createContainerConfig( + None(), + createExecutorInfo("executor", command), + directory), std::map<string, string>(), - false); + None()); AWAIT_READY(launch); ASSERT_TRUE(launch.get()); @@ -178,13 +179,12 @@ TEST_F(NamespacesIsolatorTest, ROOT_IPCNamespace) process::Future<bool> launch = containerizer.get()->launch( containerId, - None(), - createExecutorInfo("executor", command), - directory, - None(), - SlaveID(), + createContainerConfig( + None(), + createExecutorInfo("executor", command), + directory), std::map<string, string>(), - false); + None()); AWAIT_READY(launch); ASSERT_TRUE(launch.get()); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/linux_filesystem_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp index 70a0dce..803758c 100644 --- a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp +++ b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp @@ -69,11 +69,7 @@ namespace mesos { namespace internal { namespace tests { -class LinuxFilesystemIsolatorTest : public MesosTest -{ -protected: - Fetcher fetcher; -}; +class LinuxFilesystemIsolatorTest : public MesosTest {}; // This test verifies that the root filesystem of the container is @@ -89,6 +85,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_ChangeRootFilesystem) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -110,13 +108,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_ChangeRootFilesystem) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -142,6 +136,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_Metrics) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -164,13 +160,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_Metrics) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -205,6 +197,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_VolumeFromSandbox) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -228,13 +222,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_VolumeFromSandbox) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -263,6 +253,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_VolumeFromHost) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -289,13 +281,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_VolumeFromHost) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -322,6 +310,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_FileVolumeFromHost) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -348,13 +338,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_FileVolumeFromHost) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY_FOR(launch, Seconds(60)); @@ -381,6 +367,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_VolumeFromHostSandboxMountPoint) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -407,13 +395,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_VolumeFromHostSandboxMountPoint) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -440,6 +424,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_FileVolumeFromHostSandboxMountPoint) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -466,13 +452,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_FileVolumeFromHostSandboxMountPoint) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY_FOR(launch, Seconds(60)); @@ -498,6 +480,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeWithRootFilesystem) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -533,13 +517,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeWithRootFilesystem) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -567,6 +547,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeWithoutRootFilesystem) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -600,13 +582,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeWithoutRootFilesystem) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -635,6 +613,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_MultipleContainers) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -674,13 +654,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_MultipleContainers) Future<bool> launch1 = containerizer->launch( containerId1, - None(), - executor1, - directory1, - None(), - SlaveID(), + createContainerConfig(None(), executor1, directory1), map<string, string>(), - false); + None()); AWAIT_READY(launch1); @@ -695,13 +671,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_MultipleContainers) Future<bool> launch2 = containerizer->launch( containerId2, - None(), - executor2, - directory2, - None(), - SlaveID(), + createContainerConfig(None(), executor2, directory2), map<string, string>(), - false); + None()); AWAIT_READY(launch1); @@ -819,6 +791,8 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeMountPointCleanup) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "filesystem/linux"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -852,13 +826,9 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeMountPointCleanup) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_READY(launch); @@ -1193,6 +1163,8 @@ TEST_F(LinuxFilesystemIsolatorMesosTest, flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/memory_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/memory_isolator_tests.cpp b/src/tests/containerizer/memory_isolator_tests.cpp index 0df4aa8..b7b7acd 100644 --- a/src/tests/containerizer/memory_isolator_tests.cpp +++ b/src/tests/containerizer/memory_isolator_tests.cpp @@ -72,7 +72,7 @@ TEST_P(MemoryIsolatorTest, ROOT_MemUsage) slave::Flags flags = CreateSlaveFlags(); flags.isolation = GetParam(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/memory_pressure_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/memory_pressure_tests.cpp b/src/tests/containerizer/memory_pressure_tests.cpp index c4ad779..8a43c4f 100644 --- a/src/tests/containerizer/memory_pressure_tests.cpp +++ b/src/tests/containerizer/memory_pressure_tests.cpp @@ -84,7 +84,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_Statistics) // We only care about memory cgroup for this test. flags.isolation = "cgroups/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -201,7 +201,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery) // We only care about memory cgroup for this test. flags.isolation = "cgroups/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/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 d062f2f..16e015a 100644 --- a/src/tests/containerizer/port_mapping_tests.cpp +++ b/src/tests/containerizer/port_mapping_tests.cpp @@ -1849,8 +1849,6 @@ public: ContainerizerTest<MesosContainerizer>::TearDown(); } - Fetcher fetcher; - // Name of the host eth0 and lo. string eth0; string lo; @@ -1875,6 +1873,8 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers) // we create in this test. Also, this will bypass MESOS-2554. slaveFlags.isolation = "cgroups/cpu,cgroups/mem"; + Fetcher fetcher(slaveFlags); + Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(slaveFlags, true, &fetcher); @@ -2049,6 +2049,8 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan) // NOTE: We add 'cgroups/cpu,cgroups/mem' to bypass MESOS-2554. flags.isolation = "cgroups/cpu,cgroups/mem,network/port_mapping"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -2174,6 +2176,8 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "network/port_mapping"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -2262,6 +2266,8 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedKnownAndUnKnownOrphans) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "network/port_mapping"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/volume_image_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/volume_image_isolator_tests.cpp b/src/tests/containerizer/volume_image_isolator_tests.cpp index ad18844..2f91730 100644 --- a/src/tests/containerizer/volume_image_isolator_tests.cpp +++ b/src/tests/containerizer/volume_image_isolator_tests.cpp @@ -61,7 +61,6 @@ protected: } bool nesting; - Fetcher fetcher; }; @@ -85,6 +84,8 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithoutRootFilesystem) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -114,13 +115,9 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithoutRootFilesystem) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_ASSERT_TRUE(launch); @@ -133,10 +130,9 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithoutRootFilesystem) launch = containerizer->launch( nestedContainerId, - command, - container, - None(), - SlaveID()); + createContainerConfig(command, container), + map<string, string>(), + None()); AWAIT_ASSERT_TRUE(launch); @@ -176,6 +172,8 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem) flags.docker_store_dir = path::join(sandbox.get(), "store"); flags.image_providers = "docker"; + Fetcher fetcher(flags); + Try<MesosContainerizer*> create = MesosContainerizer::create(flags, true, &fetcher); @@ -207,13 +205,9 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); AWAIT_ASSERT_TRUE(launch); @@ -226,10 +220,9 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem) launch = containerizer->launch( nestedContainerId, - command, - container, - None(), - SlaveID()); + createContainerConfig(command, container), + map<string, string>(), + None()); AWAIT_ASSERT_TRUE(launch); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/volume_secret_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/volume_secret_isolator_tests.cpp b/src/tests/containerizer/volume_secret_isolator_tests.cpp index 073c392..a55af95 100644 --- a/src/tests/containerizer/volume_secret_isolator_tests.cpp +++ b/src/tests/containerizer/volume_secret_isolator_tests.cpp @@ -159,7 +159,7 @@ TEST_P(VolumeSecretIsolatorTest, ROOT_SecretInVolumeWithRootFilesystem) flags.image_providers = "docker"; } - Fetcher fetcher; + Fetcher fetcher(flags); Try<SecretResolver*> secretResolver = SecretResolver::create(); EXPECT_SOME(secretResolver); @@ -206,13 +206,9 @@ TEST_P(VolumeSecretIsolatorTest, ROOT_SecretInVolumeWithRootFilesystem) Future<bool> launch = containerizer->launch( containerId, - None(), - executor, - directory, - None(), - SlaveID(), + createContainerConfig(None(), executor, directory), map<string, string>(), - false); + None()); if (expectedContainerLaunchStatus == CONTAINER_LAUNCH_FAILURE) { AWAIT_FAILED(launch); @@ -232,10 +228,9 @@ TEST_P(VolumeSecretIsolatorTest, ROOT_SecretInVolumeWithRootFilesystem) launch = containerizer->launch( nestedContainerId, - nestedCommand, - containerInfo, - None(), - state.id); + createContainerConfig(nestedCommand, containerInfo), + map<string, string>(), + None()); AWAIT_ASSERT_TRUE(launch); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/containerizer/xfs_quota_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/xfs_quota_tests.cpp b/src/tests/containerizer/xfs_quota_tests.cpp index b33fe8b..c220a6b 100644 --- a/src/tests/containerizer/xfs_quota_tests.cpp +++ b/src/tests/containerizer/xfs_quota_tests.cpp @@ -510,10 +510,11 @@ TEST_F(ROOT_XFS_QuotaTest, ResourceStatistics) Try<Owned<cluster::Master>> master = StartMaster(); ASSERT_SOME(master); - Fetcher fetcher; - Owned<MasterDetector> detector = master.get()->createDetector(); slave::Flags flags = CreateSlaveFlags(); + Fetcher fetcher(flags); + Owned<MasterDetector> detector = master.get()->createDetector(); + Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -606,12 +607,12 @@ TEST_F(ROOT_XFS_QuotaTest, ResourceStatisticsNoEnforce) Try<Owned<cluster::Master>> master = StartMaster(); ASSERT_SOME(master); - Fetcher fetcher; - Owned<MasterDetector> detector = master.get()->createDetector(); - slave::Flags flags = CreateSlaveFlags(); flags.enforce_container_disk_quota = false; + Fetcher fetcher(flags); + Owned<MasterDetector> detector = master.get()->createDetector(); + Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -707,7 +708,7 @@ TEST_F(ROOT_XFS_QuotaTest, NoCheckpointRecovery) slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/disk_quota_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/disk_quota_tests.cpp b/src/tests/disk_quota_tests.cpp index a0a7093..3bf0508 100644 --- a/src/tests/disk_quota_tests.cpp +++ b/src/tests/disk_quota_tests.cpp @@ -354,7 +354,7 @@ TEST_F(DiskQuotaTest, NoQuotaEnforcement) flags.container_disk_watch_interval = Milliseconds(1); flags.enforce_container_disk_quota = false; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -455,7 +455,7 @@ TEST_F(DiskQuotaTest, ResourceStatistics) // the 'du' subprocess. flags.container_disk_watch_interval = Milliseconds(1); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -609,7 +609,7 @@ TEST_F(DiskQuotaTest, SlaveRecovery) flags.isolation = "posix/cpu,posix/mem,disk/du"; flags.container_disk_watch_interval = Milliseconds(1); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/health_check_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp index 4e339bf..7917a22 100644 --- a/src/tests/health_check_tests.cpp +++ b/src/tests/health_check_tests.cpp @@ -545,7 +545,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask) slave::Flags agentFlags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(agentFlags); Try<ContainerLogger*> logger = ContainerLogger::create(agentFlags.container_logger); @@ -597,7 +597,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask) containerInfo); Future<ContainerID> containerId; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(DoAll(FutureArg<0>(&containerId), Invoke(&containerizer, &MockDockerContainerizer::_launch))); @@ -818,7 +818,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags agentFlags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(agentFlags); Try<ContainerLogger*> logger = ContainerLogger::create(agentFlags.container_logger); @@ -889,7 +889,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( containerInfo); Future<ContainerID> containerId; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(DoAll(FutureArg<0>(&containerId), Invoke(&containerizer, &MockDockerContainerizer::_launch))); @@ -1841,7 +1841,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags agentFlags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(agentFlags); Try<ContainerLogger*> logger = ContainerLogger::create(agentFlags.container_logger); @@ -1906,7 +1906,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( task.mutable_health_check()->CopyFrom(healthCheck); Future<ContainerID> containerId; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(DoAll(FutureArg<0>(&containerId), Invoke(&containerizer, &MockDockerContainerizer::_launch))); @@ -1972,7 +1972,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags agentFlags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(agentFlags); Try<ContainerLogger*> logger = ContainerLogger::create(agentFlags.container_logger); @@ -2039,7 +2039,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( task.mutable_health_check()->CopyFrom(healthCheck); Future<ContainerID> containerId; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(DoAll(FutureArg<0>(&containerId), Invoke(&containerizer, &MockDockerContainerizer::_launch))); @@ -2108,7 +2108,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags agentFlags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(agentFlags); Try<ContainerLogger*> logger = ContainerLogger::create(agentFlags.container_logger); @@ -2173,7 +2173,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( task.mutable_health_check()->CopyFrom(healthCheck); Future<ContainerID> containerId; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(DoAll(FutureArg<0>(&containerId), Invoke(&containerizer, &MockDockerContainerizer::_launch))); @@ -2247,7 +2247,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( flags.acls = acls; #endif // USE_SSL_SOCKET - Fetcher fetcher; + Fetcher fetcher(flags); // We have to explicitly create a `Containerizer` in non-local mode, // because `LaunchNestedContainerSession` (used by command health http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/hook_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp index f051fae..04edbf8 100644 --- a/src/tests/hook_tests.cpp +++ b/src/tests/hook_tests.cpp @@ -287,10 +287,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( VerifySlaveExecutorEnvironmentDecorator) { const string& directory = os::getcwd(); // We're inside a temporary sandbox. - Fetcher fetcher; + + slave::Flags flags = CreateSlaveFlags(); + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = - MesosContainerizer::create(CreateSlaveFlags(), false, &fetcher); + MesosContainerizer::create(flags, false, &fetcher); ASSERT_SOME(_containerizer); Owned<MesosContainerizer> containerizer(_containerizer.get()); @@ -305,7 +307,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( SlaveID slaveId = SlaveID(); std::map<string, string> environment = executorEnvironment( - CreateSlaveFlags(), + flags, executorInfo, directory, slaveId, @@ -318,13 +320,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( // command validates the hook. process::Future<bool> launch = containerizer->launch( containerId, - None(), - executorInfo, - directory, - None(), - slaveId, + createContainerConfig(None(), executorInfo, directory), environment, - false); + None()); AWAIT_READY(launch); ASSERT_TRUE(launch.get()); @@ -652,7 +650,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<ContainerLogger*> logger = ContainerLogger::create(flags.container_logger); @@ -704,7 +702,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( task.mutable_container()->CopyFrom(containerInfo); Future<ContainerID> containerId; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(DoAll(FutureArg<0>(&containerId), Invoke(&containerizer, &MockDockerContainerizer::_launch))); @@ -761,7 +759,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<ContainerLogger*> logger = ContainerLogger::create(flags.container_logger); @@ -856,7 +854,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<ContainerLogger*> logger = ContainerLogger::create(flags.container_logger); @@ -921,7 +919,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( tasks.push_back(task); Future<ContainerID> containerId; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(DoAll(FutureArg<0>(&containerId), Invoke(&containerizer, &MockDockerContainerizer::_launch))); @@ -982,7 +980,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, ROOT_DOCKER_VerifySlavePostFetchHook) slave::Flags flags = CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<ContainerLogger*> logger = ContainerLogger::create(flags.container_logger); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 1dfe5fd..bacd44d 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -6353,7 +6353,7 @@ TEST_F(MasterTest, AgentRestartNoReregister) slave::Flags agentFlags = CreateSlaveFlags(); agentFlags.credential = None(); - mesos::internal::slave::Fetcher fetcher; + mesos::internal::slave::Fetcher fetcher(agentFlags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(agentFlags, true, &fetcher); @@ -6550,7 +6550,7 @@ TEST_F(MasterTest, AgentRestartNoReregisterRateLimit) ASSERT_SOME(master); slave::Flags agentFlags = CreateSlaveFlags(); - mesos::internal::slave::Fetcher fetcher; + mesos::internal::slave::Fetcher fetcher(agentFlags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(agentFlags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 0aa87f5..aedc60a 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -175,7 +175,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -355,7 +355,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverStatusUpdateManager) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -438,7 +438,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ReconnectHTTPExecutor) slave::Flags flags = this->CreateSlaveFlags(); flags.http_command_executor = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -536,7 +536,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ROOT_CGROUPS_ReconnectDefaultExecutor) slave::Flags flags = this->CreateSlaveFlags(); flags.authenticate_http_readwrite = false; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -724,7 +724,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutor) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -814,7 +814,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoverUnregisteredHTTPExecutor) slave::Flags flags = this->CreateSlaveFlags(); flags.http_command_executor = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -930,7 +930,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1042,7 +1042,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTaskUnregisteredExecutor) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1147,7 +1147,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedHTTPExecutor) slave::Flags flags = this->CreateSlaveFlags(); flags.http_command_executor = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1294,7 +1294,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1424,7 +1424,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout) slave::Flags flags = this->CreateSlaveFlags(); flags.recovery_timeout = Milliseconds(1); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1516,7 +1516,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverCompletedExecutor) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1606,7 +1606,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_CleanupHTTPExecutor) slave::Flags flags = this->CreateSlaveFlags(); flags.http_command_executor = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1711,7 +1711,7 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1812,7 +1812,7 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -1925,7 +1925,7 @@ TYPED_TEST(SlaveRecoveryTest, NonCheckpointingFramework) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2021,7 +2021,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_KillTaskWithHTTPExecutor) slave::Flags flags = this->CreateSlaveFlags(); flags.http_command_executor = true; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2140,7 +2140,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTask) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2260,7 +2260,7 @@ TYPED_TEST(SlaveRecoveryTest, Reboot) slave::Flags flags = this->CreateSlaveFlags(); flags.strict = false; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2407,7 +2407,7 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor) slave::Flags flags = this->CreateSlaveFlags(); flags.strict = false; - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2541,7 +2541,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2660,7 +2660,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlaveSIGUSR1) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2766,7 +2766,7 @@ TYPED_TEST(SlaveRecoveryTest, RegisterDisconnectedSlave) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2885,7 +2885,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileKillTask) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -2985,7 +2985,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileShutdownFramework) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -3127,7 +3127,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave) EXPECT_CALL(allocator, addSlave(_, _, _, _, _, _)); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -3296,7 +3296,7 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -3446,7 +3446,7 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -3585,7 +3585,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<TypeParam*> _containerizer = TypeParam::create(flags, true, &fetcher); ASSERT_SOME(_containerizer); @@ -3772,7 +3772,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleSlaves) // cgroups isolation is involved. flags1.isolation = "filesystem/posix,posix/mem,posix/cpu"; - Fetcher fetcher; + Fetcher fetcher(flags1); Owned<MasterDetector> detector = master.get()->createDetector(); @@ -3954,7 +3954,7 @@ TYPED_TEST(SlaveRecoveryTest, RestartBeforeContainerizerLaunch) // Expect the launch but don't do anything. Future<Nothing> launch; - EXPECT_CALL(containerizer1, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer1, launch(_, _, _, _)) .WillOnce(DoAll(FutureSatisfy(&launch), Return(Future<bool>()))); @@ -4018,7 +4018,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, ResourceStatistics) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -4119,7 +4119,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward) slave::Flags flags = this->CreateSlaveFlags(); flags.isolation = "cgroups/cpu,cgroups/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -4223,7 +4223,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward) slave::Flags flags = this->CreateSlaveFlags(); flags.isolation = "cgroups/cpu,cgroups/mem,filesystem/linux,namespaces/pid"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); http://git-wip-us.apache.org/repos/asf/mesos/blob/74c61ceb/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index b56b014..68ed8e9 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -95,6 +95,7 @@ using mesos::internal::protobuf::createLabel; using mesos::master::detector::MasterDetector; using mesos::master::detector::StandaloneMasterDetector; +using mesos::slave::ContainerConfig; using mesos::slave::ContainerTermination; using mesos::v1::scheduler::Call; @@ -327,7 +328,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ShutdownUnregisteredExecutor) // be created. flags.isolation = "posix/cpu,posix/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -439,7 +440,7 @@ TEST_F(SlaveTest, ExecutorTimeoutCausedBySlowFetch) slave::Flags flags = CreateSlaveFlags(); flags.hadoop_home = hadoopPath; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create( flags, true, &fetcher); @@ -628,7 +629,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, CommandTaskWithArguments) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "posix/cpu,posix/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -909,7 +910,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "posix/cpu,posix/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -963,13 +964,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo) slaveID.set_value(UUID::random().toString()); Future<bool> launch = containerizer->launch( containerId, - task, - executor, - sandbox.get(), - "nobody", - slaveID, + createContainerConfig(task, executor, sandbox.get(), "nobody"), map<string, string>(), - false); + None()); AWAIT_READY(launch); // TODO(spikecurtis): With agent capabilities (MESOS-3362), the @@ -996,7 +993,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS( slave::Flags flags = CreateSlaveFlags(); flags.isolation = "posix/cpu,posix/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -1096,7 +1093,7 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser) slave::Flags flags = CreateSlaveFlags(); flags.isolation = "posix/cpu,posix/mem"; - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, false, &fetcher); @@ -1423,7 +1420,7 @@ TEST_F(SlaveTest, MetricsSlaveLaunchErrors) JSON::Object snapshot = Metrics(); EXPECT_EQ(0, snapshot.values["slave/container_launch_errors"]); - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(containerizer, launch(_, _, _, _)) .WillOnce(Return(Failure("Injected failure"))); Future<TaskStatus> failureUpdate; @@ -4908,7 +4905,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, HTTPSchedulerSlaveRestart) slave::Flags flags = this->CreateSlaveFlags(); - Fetcher fetcher; + Fetcher fetcher(flags); Try<MesosContainerizer*> _containerizer = MesosContainerizer::create(flags, true, &fetcher); @@ -6624,9 +6621,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, DefaultExecutorCommandInfo) AWAIT_READY(offers); EXPECT_NE(0, offers->offers().size()); - Future<ExecutorInfo> executorInfo_; - EXPECT_CALL(containerizer, launch(_, _, _, _, _, _, _, _)) - .WillOnce(DoAll(FutureArg<2>(&executorInfo_), + Future<ContainerConfig> containerConfig; + EXPECT_CALL(containerizer, launch(_, _, _, _)) + .WillOnce(DoAll(FutureArg<1>(&containerConfig), Return(Future<bool>()))); const v1::Offer& offer = offers->offers(0); @@ -6658,13 +6655,16 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, DefaultExecutorCommandInfo) mesos.send(call); } - AWAIT_READY(executorInfo_); + AWAIT_READY(containerConfig); // TODO(anand): Add a `strings::contains()` check to ensure // `MESOS_DEFAULT_EXECUTOR` is present in the command when // we add the executable for default executor. - ASSERT_TRUE(executorInfo_->has_command()); - EXPECT_EQ(frameworkInfo.user(), executorInfo_->command().user()); + ASSERT_TRUE(containerConfig->has_executor_info()); + ASSERT_TRUE(containerConfig->executor_info().has_command()); + EXPECT_EQ( + frameworkInfo.user(), + containerConfig->executor_info().command().user()); }
