You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2018/08/29 19:17:44 UTC
[mesos] 01/03: Windows: Enable DockerFetcher in Windows agent.
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit cdf8eab619239600f5105965b676b13887931f91
Author: Liangyu Zhao <t-...@microsoft.com>
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 | 15 +++++----------
src/slave/containerizer/mesos/containerizer.cpp | 2 ++
src/uri/fetcher.cpp | 3 ---
src/uri/fetcher.hpp | 5 -----
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 56081c0..7323682 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -184,11 +184,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
@@ -450,13 +446,9 @@ set(URI_SRC
uri/utils.cpp
uri/fetchers/copy.cpp
uri/fetchers/curl.cpp
+ uri/fetchers/docker.cpp
uri/fetchers/hadoop.cpp)
-if (NOT WIN32)
- list(APPEND URI_SRC
- uri/fetchers/docker.cpp)
-endif ()
-
set(USAGE_SRC
usage/usage.cpp)
@@ -473,6 +465,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 c38bfac..29e05e6 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -82,6 +82,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"
@@ -377,6 +378,7 @@ Try<MesosContainerizer*> MesosContainerizer::create(
#endif // __WINDOWS__
#ifdef __WINDOWS__
+ {"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 489c7ce..3147e41 100644
--- a/src/uri/fetcher.cpp
+++ b/src/uri/fetcher.cpp
@@ -52,11 +52,8 @@ Try<Owned<Fetcher>> create(const Option<Flags>& _flags)
[flags]() { return CopyFetcherPlugin::create(flags); }},
{HadoopFetcherPlugin::NAME,
[flags]() { return HadoopFetcherPlugin::create(flags); }},
-#ifndef __WINDOWS__
- // TODO(coffler): Enable Docker plugin. See MESOS-8570.
{DockerFetcherPlugin::NAME,
[flags]() { return DockerFetcherPlugin::create(flags); }},
-#endif // __WINDOWS__
};
vector<Owned<Fetcher::Plugin>> plugins;
diff --git a/src/uri/fetcher.hpp b/src/uri/fetcher.hpp
index fbf64c6..cc4bd93 100644
--- a/src/uri/fetcher.hpp
+++ b/src/uri/fetcher.hpp
@@ -40,13 +40,8 @@ namespace fetcher {
class Flags :
public virtual CopyFetcherPlugin::Flags,
public virtual CurlFetcherPlugin::Flags,
-#ifdef __WINDOWS__
- public virtual HadoopFetcherPlugin::Flags {};
-#else
- // TODO(coffler): Add support for Docker plugins. See MESOS-8570.
public virtual HadoopFetcherPlugin::Flags,
public virtual DockerFetcherPlugin::Flags {};
-#endif // __WINDOWS__
/**