This is an automated email from the ASF dual-hosted git repository. qianzhang pushed a commit to branch 1.5.x in repository https://gitbox.apache.org/repos/asf/mesos.git
commit f11b0b2c4c5f4f752603d15c573c353409bf12c9 Author: Liangyu Zhao <[email protected]> AuthorDate: Wed Aug 29 11:54:25 2018 -0700 Windows: Enable DockerFetcher in Windows agent. Review: https://reviews.apache.org/r/68455/ --- src/CMakeLists.txt | 13 ++++++------- src/slave/containerizer/mesos/containerizer.cpp | 2 ++ src/uri/fetcher.cpp | 6 +++--- src/uri/fetcher.hpp | 10 +++++----- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c825855..865ad59 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -160,11 +160,7 @@ set(AGENT_SRC slave/containerizer/mesos/provisioner/docker/store.cpp slave/resource_estimators/noop.cpp) -if (WIN32) - list(APPEND AGENT_SRC - slave/containerizer/mesos/isolators/windows/cpu.cpp - slave/containerizer/mesos/isolators/windows/mem.cpp) -else () +if (NOT WIN32) list(APPEND AGENT_SRC slave/containerizer/mesos/utils.cpp slave/containerizer/mesos/isolators/environment_secret.cpp @@ -376,11 +372,11 @@ set(URI_SRC uri/fetcher.cpp uri/utils.cpp uri/fetchers/copy.cpp - uri/fetchers/curl.cpp) + uri/fetchers/curl.cpp + uri/fetchers/docker.cpp) if (NOT WIN32) list(APPEND URI_SRC - uri/fetchers/docker.cpp uri/fetchers/hadoop.cpp) endif () @@ -400,6 +396,9 @@ set(WATCHER_SRC watcher/whitelist_watcher.cpp) set(WIN32_SRC + slave/containerizer/mesos/isolators/docker/runtime.cpp + slave/containerizer/mesos/isolators/windows/cpu.cpp + slave/containerizer/mesos/isolators/windows/mem.cpp slave/containerizer/mesos/isolators/environment_secret.cpp slave/containerizer/mesos/isolators/filesystem/posix.cpp slave/containerizer/mesos/isolators/filesystem/windows.cpp) diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index e1e5ba4..fa1473e 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -81,6 +81,7 @@ #include "slave/containerizer/mesos/provisioner/provisioner.hpp" #ifdef __WINDOWS__ +#include "slave/containerizer/mesos/isolators/docker/runtime.hpp" #include "slave/containerizer/mesos/isolators/windows/cpu.hpp" #include "slave/containerizer/mesos/isolators/windows/mem.hpp" #include "slave/containerizer/mesos/isolators/filesystem/windows.hpp" @@ -394,6 +395,7 @@ Try<MesosContainerizer*> MesosContainerizer::create( {"disk/xfs", &XfsDiskIsolatorProcess::create}, #endif // ENABLE_XFS_DISK_ISOLATOR #else + {"docker/runtime", &DockerRuntimeIsolatorProcess::create}, {"windows/cpu", &WindowsCpuIsolatorProcess::create}, {"windows/mem", &WindowsMemIsolatorProcess::create}, #endif // __WINDOWS__ diff --git a/src/uri/fetcher.cpp b/src/uri/fetcher.cpp index 13c2d54..005b6f7 100644 --- a/src/uri/fetcher.cpp +++ b/src/uri/fetcher.cpp @@ -50,12 +50,12 @@ Try<Owned<Fetcher>> create(const Option<Flags>& _flags) [flags]() { return CurlFetcherPlugin::create(flags); }}, {CopyFetcherPlugin::NAME, [flags]() { return CopyFetcherPlugin::create(flags); }}, + {DockerFetcherPlugin::NAME, + [flags]() { return DockerFetcherPlugin::create(flags); }}, #ifndef __WINDOWS__ - // TODO(dpravat): Enable `Hadoop` and `Docker` plugins. See MESOS-5473. + // TODO(dpravat): Enable `Hadoop` plugin. See MESOS-5473. {HadoopFetcherPlugin::NAME, [flags]() { return HadoopFetcherPlugin::create(flags); }}, - {DockerFetcherPlugin::NAME, - [flags]() { return DockerFetcherPlugin::create(flags); }}, #endif // __WINDOWS__ }; diff --git a/src/uri/fetcher.hpp b/src/uri/fetcher.hpp index 2b2b14e..e7ec580 100644 --- a/src/uri/fetcher.hpp +++ b/src/uri/fetcher.hpp @@ -39,13 +39,13 @@ namespace fetcher { */ class Flags : public virtual CopyFetcherPlugin::Flags, -#ifdef __WINDOWS__ - // TODO(dpravat): Add support for Hadoop and Docker plugins. See MESOS-5473. - public virtual CurlFetcherPlugin::Flags {}; -#else public virtual CurlFetcherPlugin::Flags, - public virtual HadoopFetcherPlugin::Flags, +#ifdef __WINDOWS__ + // TODO(dpravat): Add support for Hadoop plugin. See MESOS-5473. public virtual DockerFetcherPlugin::Flags {}; +#else + public virtual DockerFetcherPlugin::Flags, + public virtual HadoopFetcherPlugin::Flags {}; #endif // __WINDOWS__
