[mesos] 01/02: Moved the Docker executor declaration into a header.
This is an automated email from the ASF dual-hosted git repository.
abudnik pushed a commit to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 1995f63352a5a8c2c8e73adefed708a8620a5d47
Author: Greg Mann
AuthorDate: Thu Jul 25 12:17:41 2019 -0700
Moved the Docker executor declaration into a header.
This moves the declaration of the Docker executor into the
Docker executor header file and moves the code for the Docker
executor binary into a new launcher implementation file.
This change will enable the Mesos executor driver
implementation to make use of the `DockerExecutor` symbol.
Review: https://reviews.apache.org/r/71033/
---
src/CMakeLists.txt | 2 +-
src/Makefile.am | 3 +-
src/docker/CMakeLists.txt| 20 ---
src/docker/executor.cpp | 348 +--
src/docker/executor.hpp | 53 ++
src/launcher/CMakeLists.txt | 5 +
src/launcher/docker_executor.cpp | 266 ++
7 files changed, 408 insertions(+), 289 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d4f541..e1a5980 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -249,6 +249,7 @@ set(CSI_SRC
set(DOCKER_SRC
docker/docker.cpp
+ docker/executor.cpp
docker/spec.cpp)
set(EXECUTOR_SRC
@@ -620,7 +621,6 @@ endif ()
##
add_subdirectory(checks)
add_subdirectory(cli)
-add_subdirectory(docker)
add_subdirectory(examples)
add_subdirectory(launcher)
add_subdirectory(local)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f97523..ba4d453 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1089,6 +1089,7 @@ libmesos_no_3rdparty_la_SOURCES +=
\
docker/docker.cpp\
docker/docker.hpp\
docker/executor.hpp \
+ docker/executor.cpp \
docker/spec.cpp \
examples/flags.hpp \
examples/test_anonymous_module.hpp \
@@ -1809,7 +1810,7 @@ mesos_usage_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_usage_LDADD = libmesos.la $(LDADD)
pkglibexec_PROGRAMS += mesos-docker-executor
-mesos_docker_executor_SOURCES = docker/executor.cpp
+mesos_docker_executor_SOURCES = launcher/docker_executor.cpp
mesos_docker_executor_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_docker_executor_LDADD = libmesos.la $(LDADD)
diff --git a/src/docker/CMakeLists.txt b/src/docker/CMakeLists.txt
deleted file mode 100644
index 1196664..000
--- a/src/docker/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# THE DOCKER EXECUTOR EXECUTABLE.
-#
-add_executable(mesos-docker-executor executor.cpp)
-target_link_libraries(mesos-docker-executor PRIVATE mesos)
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index ed1b718..642ed65 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -854,291 +854,105 @@ private:
};
-class DockerExecutor : public Executor
+DockerExecutor::DockerExecutor(
+const Owned& docker,
+const string& container,
+const string& sandboxDirectory,
+const string& mappedDirectory,
+const Duration& shutdownGracePeriod,
+const string& launcherDir,
+const map& taskEnvironment,
+const Option& defaultContainerDNS,
+bool cgroupsEnableCfs)
{
-public:
- DockerExecutor(
- const Owned& docker,
- const string& container,
- const string& sandboxDirectory,
- const string& mappedDirectory,
- const Duration& shutdownGracePeriod,
- const string& launcherDir,
- const map& taskEnvironment,
- const Option& defaultContainerDNS,
- bool cgroupsEnableCfs)
- {
-process = Owned(new DockerExecutorProcess(
-docker,
-container,
-sandboxDirectory,
-mappedDirectory,
-shutdownGracePeriod,
-
[mesos] branch 1.8.x updated (a2ca451 -> b17ed79)
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a change to branch 1.8.x in repository https://gitbox.apache.org/repos/asf/mesos.git. from a2ca451 Changed termination logic of the default executor. new 1995f63 Moved the Docker executor declaration into a header. new b17ed79 Fixed compiler error. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/CMakeLists.txt | 2 +- src/Makefile.am | 3 +- src/docker/CMakeLists.txt| 20 --- src/docker/executor.cpp | 348 +-- src/docker/executor.hpp | 53 ++ src/exec/exec.cpp| 2 + src/launcher/CMakeLists.txt | 5 + src/launcher/docker_executor.cpp | 266 ++ 8 files changed, 410 insertions(+), 289 deletions(-) delete mode 100644 src/docker/CMakeLists.txt create mode 100644 src/launcher/docker_executor.cpp
[mesos] 02/02: Fixed compiler error.
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a commit to branch 1.8.x in repository https://gitbox.apache.org/repos/asf/mesos.git commit b17ed79106b11c5f382006c453b4f885721e3f23 Author: Andrei Budnik AuthorDate: Tue Feb 4 13:12:19 2020 +0100 Fixed compiler error. --- src/exec/exec.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp index dee2074..5838565 100644 --- a/src/exec/exec.cpp +++ b/src/exec/exec.cpp @@ -47,6 +47,8 @@ #include "common/protobuf_utils.hpp" +#include "docker/executor.hpp" + #include "logging/flags.hpp" #include "logging/logging.hpp"
[mesos] branch 1.7.x updated (5b39908 -> 8af5a6d)
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a change to branch 1.7.x in repository https://gitbox.apache.org/repos/asf/mesos.git. from 5b39908 Changed termination logic of the default executor. new 0567b31 Moved the Docker executor declaration into a header. new 8af5a6d Fixed compiler error. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/CMakeLists.txt | 2 +- src/Makefile.am | 3 +- src/docker/CMakeLists.txt| 20 --- src/docker/executor.cpp | 348 +-- src/docker/executor.hpp | 53 ++ src/exec/exec.cpp| 2 + src/launcher/CMakeLists.txt | 5 + src/launcher/docker_executor.cpp | 266 ++ 8 files changed, 410 insertions(+), 289 deletions(-) delete mode 100644 src/docker/CMakeLists.txt create mode 100644 src/launcher/docker_executor.cpp
[mesos] 01/02: Moved the Docker executor declaration into a header.
This is an automated email from the ASF dual-hosted git repository.
abudnik pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 0567b31212105821d0b37ad049228dab6e98ed63
Author: Greg Mann
AuthorDate: Thu Jul 25 12:17:41 2019 -0700
Moved the Docker executor declaration into a header.
This moves the declaration of the Docker executor into the
Docker executor header file and moves the code for the Docker
executor binary into a new launcher implementation file.
This change will enable the Mesos executor driver
implementation to make use of the `DockerExecutor` symbol.
Review: https://reviews.apache.org/r/71033/
---
src/CMakeLists.txt | 2 +-
src/Makefile.am | 3 +-
src/docker/CMakeLists.txt| 20 ---
src/docker/executor.cpp | 348 +--
src/docker/executor.hpp | 53 ++
src/launcher/CMakeLists.txt | 5 +
src/launcher/docker_executor.cpp | 266 ++
7 files changed, 408 insertions(+), 289 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bfc8db..8b3e84a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -242,6 +242,7 @@ set(CSI_SRC
set(DOCKER_SRC
docker/docker.cpp
+ docker/executor.cpp
docker/spec.cpp)
set(EXECUTOR_SRC
@@ -599,7 +600,6 @@ endif ()
##
add_subdirectory(checks)
add_subdirectory(cli)
-add_subdirectory(docker)
add_subdirectory(examples)
add_subdirectory(launcher)
add_subdirectory(local)
diff --git a/src/Makefile.am b/src/Makefile.am
index fb2a27e..4e99723 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1006,6 +1006,7 @@ libmesos_no_3rdparty_la_SOURCES +=
\
common/validation.cpp
\
common/values.cpp\
docker/docker.cpp\
+ docker/executor.cpp \
docker/spec.cpp \
exec/exec.cpp
\
executor/executor.cpp
\
@@ -1743,7 +1744,7 @@ mesos_usage_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_usage_LDADD = libmesos.la $(LDADD)
pkglibexec_PROGRAMS += mesos-docker-executor
-mesos_docker_executor_SOURCES = docker/executor.cpp
+mesos_docker_executor_SOURCES = launcher/docker_executor.cpp
mesos_docker_executor_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_docker_executor_LDADD = libmesos.la $(LDADD)
diff --git a/src/docker/CMakeLists.txt b/src/docker/CMakeLists.txt
deleted file mode 100644
index 1196664..000
--- a/src/docker/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# THE DOCKER EXECUTOR EXECUTABLE.
-#
-add_executable(mesos-docker-executor executor.cpp)
-target_link_libraries(mesos-docker-executor PRIVATE mesos)
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index ed1b718..642ed65 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -854,291 +854,105 @@ private:
};
-class DockerExecutor : public Executor
+DockerExecutor::DockerExecutor(
+const Owned& docker,
+const string& container,
+const string& sandboxDirectory,
+const string& mappedDirectory,
+const Duration& shutdownGracePeriod,
+const string& launcherDir,
+const map& taskEnvironment,
+const Option& defaultContainerDNS,
+bool cgroupsEnableCfs)
{
-public:
- DockerExecutor(
- const Owned& docker,
- const string& container,
- const string& sandboxDirectory,
- const string& mappedDirectory,
- const Duration& shutdownGracePeriod,
- const string& launcherDir,
- const map& taskEnvironment,
- const Option& defaultContainerDNS,
- bool cgroupsEnableCfs)
- {
-process = Owned(new DockerExecutorProcess(
-docker,
-container,
-sandboxDirectory,
-mappedDirectory,
-
[mesos] 02/02: Fixed compiler error.
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a commit to branch 1.7.x in repository https://gitbox.apache.org/repos/asf/mesos.git commit 8af5a6d50c64abb683b803f25bbc02e320fe70f6 Author: Andrei Budnik AuthorDate: Tue Feb 4 13:12:19 2020 +0100 Fixed compiler error. --- src/exec/exec.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp index dee2074..5838565 100644 --- a/src/exec/exec.cpp +++ b/src/exec/exec.cpp @@ -47,6 +47,8 @@ #include "common/protobuf_utils.hpp" +#include "docker/executor.hpp" + #include "logging/flags.hpp" #include "logging/logging.hpp"
[mesos] branch 1.6.x updated (205525e -> 11cdf04)
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a change to branch 1.6.x in repository https://gitbox.apache.org/repos/asf/mesos.git. from 205525e Changed termination logic of the default executor. new 02eb0ce Moved the Docker executor declaration into a header. new 11cdf04 Fixed compiler error. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/CMakeLists.txt | 2 +- src/Makefile.am | 3 +- src/docker/CMakeLists.txt| 20 --- src/docker/executor.cpp | 323 ++- src/docker/executor.hpp | 53 +++ src/exec/exec.cpp| 2 + src/launcher/CMakeLists.txt | 5 + src/launcher/docker_executor.cpp | 266 8 files changed, 410 insertions(+), 264 deletions(-) delete mode 100644 src/docker/CMakeLists.txt create mode 100644 src/launcher/docker_executor.cpp
[mesos] 02/02: Fixed compiler error.
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a commit to branch 1.6.x in repository https://gitbox.apache.org/repos/asf/mesos.git commit 11cdf04e39f80a44d062627be39b53d05d76f88d Author: Andrei Budnik AuthorDate: Tue Feb 4 13:12:19 2020 +0100 Fixed compiler error. --- src/exec/exec.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp index adeb413..e5a03d9 100644 --- a/src/exec/exec.cpp +++ b/src/exec/exec.cpp @@ -47,6 +47,8 @@ #include "common/protobuf_utils.hpp" +#include "docker/executor.hpp" + #include "logging/flags.hpp" #include "logging/logging.hpp"
[mesos] 01/02: Moved the Docker executor declaration into a header.
This is an automated email from the ASF dual-hosted git repository.
abudnik pushed a commit to branch 1.6.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 02eb0ceb87dadc0a5ac6f6cd9f141347e852fb80
Author: Greg Mann
AuthorDate: Thu Jul 25 12:17:41 2019 -0700
Moved the Docker executor declaration into a header.
This moves the declaration of the Docker executor into the
Docker executor header file and moves the code for the Docker
executor binary into a new launcher implementation file.
This change will enable the Mesos executor driver
implementation to make use of the `DockerExecutor` symbol.
Review: https://reviews.apache.org/r/71033/
---
src/CMakeLists.txt | 2 +-
src/Makefile.am | 3 +-
src/docker/CMakeLists.txt| 20 ---
src/docker/executor.cpp | 323 ++-
src/docker/executor.hpp | 53 +++
src/launcher/CMakeLists.txt | 5 +
src/launcher/docker_executor.cpp | 266
7 files changed, 408 insertions(+), 264 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8cd56bb..232cf86 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -245,6 +245,7 @@ endif ()
set(DOCKER_SRC
docker/docker.cpp
+ docker/executor.cpp
docker/spec.cpp)
set(EXECUTOR_SRC
@@ -554,7 +555,6 @@ endif ()
##
add_subdirectory(checks)
add_subdirectory(cli)
-add_subdirectory(docker)
add_subdirectory(examples)
add_subdirectory(launcher)
add_subdirectory(local)
diff --git a/src/Makefile.am b/src/Makefile.am
index 98ba106..6e18cde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -992,6 +992,7 @@ libmesos_no_3rdparty_la_SOURCES +=
\
common/validation.cpp
\
common/values.cpp\
docker/docker.cpp\
+ docker/executor.cpp \
docker/spec.cpp \
exec/exec.cpp
\
executor/executor.cpp
\
@@ -1762,7 +1763,7 @@ mesos_usage_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_usage_LDADD = libmesos.la $(LDADD)
pkglibexec_PROGRAMS += mesos-docker-executor
-mesos_docker_executor_SOURCES = docker/executor.cpp
+mesos_docker_executor_SOURCES = launcher/docker_executor.cpp
mesos_docker_executor_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_docker_executor_LDADD = libmesos.la $(LDADD)
diff --git a/src/docker/CMakeLists.txt b/src/docker/CMakeLists.txt
deleted file mode 100644
index 1196664..000
--- a/src/docker/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# THE DOCKER EXECUTOR EXECUTABLE.
-#
-add_executable(mesos-docker-executor executor.cpp)
-target_link_libraries(mesos-docker-executor PRIVATE mesos)
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index d5c905d..714ed68 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -847,266 +847,105 @@ private:
};
-class DockerExecutor : public Executor
+DockerExecutor::DockerExecutor(
+const Owned& docker,
+const string& container,
+const string& sandboxDirectory,
+const string& mappedDirectory,
+const Duration& shutdownGracePeriod,
+const string& launcherDir,
+const map& taskEnvironment,
+const Option& defaultContainerDNS,
+bool cgroupsEnableCfs)
{
-public:
- DockerExecutor(
- const Owned& docker,
- const string& container,
- const string& sandboxDirectory,
- const string& mappedDirectory,
- const Duration& shutdownGracePeriod,
- const string& launcherDir,
- const map& taskEnvironment,
- const Option& defaultContainerDNS,
- bool cgroupsEnableCfs)
- {
-process = Owned(new DockerExecutorProcess(
-docker,
-container,
-sandboxDirectory,
-mappedDirectory,
-
[mesos] branch 1.5.x updated (84b7af3 -> d440095)
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a change to branch 1.5.x in repository https://gitbox.apache.org/repos/asf/mesos.git. from 84b7af3 Changed termination logic of the default executor. new 68e8655 Moved the Docker executor declaration into a header. new d440095 Fixed compiler error. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/CMakeLists.txt | 2 +- src/Makefile.am | 3 +- src/docker/CMakeLists.txt| 20 --- src/docker/executor.cpp | 323 ++- src/docker/executor.hpp | 53 +++ src/exec/exec.cpp| 2 + src/launcher/CMakeLists.txt | 5 + src/launcher/docker_executor.cpp | 265 8 files changed, 409 insertions(+), 264 deletions(-) delete mode 100644 src/docker/CMakeLists.txt create mode 100644 src/launcher/docker_executor.cpp
[mesos] 01/02: Moved the Docker executor declaration into a header.
This is an automated email from the ASF dual-hosted git repository.
abudnik pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 68e8655c8fb6dbc41de6afb66a569583b32f78d3
Author: Greg Mann
AuthorDate: Thu Jul 25 12:17:41 2019 -0700
Moved the Docker executor declaration into a header.
This moves the declaration of the Docker executor into the
Docker executor header file and moves the code for the Docker
executor binary into a new launcher implementation file.
This change will enable the Mesos executor driver
implementation to make use of the `DockerExecutor` symbol.
Review: https://reviews.apache.org/r/71033/
---
src/CMakeLists.txt | 2 +-
src/Makefile.am | 3 +-
src/docker/CMakeLists.txt| 20 ---
src/docker/executor.cpp | 323 ++-
src/docker/executor.hpp | 53 +++
src/launcher/CMakeLists.txt | 5 +
src/launcher/docker_executor.cpp | 265
7 files changed, 407 insertions(+), 264 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 865ad59..f911bab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -212,6 +212,7 @@ set(COMMON_SRC
set(DOCKER_SRC
docker/docker.cpp
+ docker/executor.cpp
docker/spec.cpp)
set(EXECUTOR_SRC
@@ -519,7 +520,6 @@ endif ()
##
add_subdirectory(checks)
add_subdirectory(cli)
-add_subdirectory(docker)
add_subdirectory(examples)
add_subdirectory(launcher)
add_subdirectory(local)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d6751f..30ff894 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -995,6 +995,7 @@ libmesos_no_3rdparty_la_SOURCES +=
\
common/validation.cpp
\
common/values.cpp\
docker/docker.cpp\
+ docker/executor.cpp \
docker/spec.cpp \
exec/exec.cpp
\
executor/executor.cpp
\
@@ -1754,7 +1755,7 @@ mesos_usage_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_usage_LDADD = libmesos.la $(LDADD)
pkglibexec_PROGRAMS += mesos-docker-executor
-mesos_docker_executor_SOURCES = docker/executor.cpp
+mesos_docker_executor_SOURCES = launcher/docker_executor.cpp
mesos_docker_executor_CPPFLAGS = $(MESOS_CPPFLAGS)
mesos_docker_executor_LDADD = libmesos.la $(LDADD)
diff --git a/src/docker/CMakeLists.txt b/src/docker/CMakeLists.txt
deleted file mode 100644
index 1196664..000
--- a/src/docker/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# THE DOCKER EXECUTOR EXECUTABLE.
-#
-add_executable(mesos-docker-executor executor.cpp)
-target_link_libraries(mesos-docker-executor PRIVATE mesos)
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 0d75801..c930ce0 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -810,266 +810,105 @@ private:
};
-class DockerExecutor : public Executor
+DockerExecutor::DockerExecutor(
+const Owned& docker,
+const string& container,
+const string& sandboxDirectory,
+const string& mappedDirectory,
+const Duration& shutdownGracePeriod,
+const string& launcherDir,
+const map& taskEnvironment,
+const Option& defaultContainerDNS,
+bool cgroupsEnableCfs)
{
-public:
- DockerExecutor(
- const Owned& docker,
- const string& container,
- const string& sandboxDirectory,
- const string& mappedDirectory,
- const Duration& shutdownGracePeriod,
- const string& launcherDir,
- const map& taskEnvironment,
- const Option& defaultContainerDNS,
- bool cgroupsEnableCfs)
- {
-process = Owned(new DockerExecutorProcess(
-docker,
-container,
-sandboxDirectory,
-mappedDirectory,
-
[mesos] 02/02: Fixed compiler error.
This is an automated email from the ASF dual-hosted git repository. abudnik pushed a commit to branch 1.5.x in repository https://gitbox.apache.org/repos/asf/mesos.git commit d440095b5a94872eabbd66def49a588d6f8f2b38 Author: Andrei Budnik AuthorDate: Tue Feb 4 13:12:19 2020 +0100 Fixed compiler error. --- src/exec/exec.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp index e964a11..05d62b1 100644 --- a/src/exec/exec.cpp +++ b/src/exec/exec.cpp @@ -47,6 +47,8 @@ #include "common/protobuf_utils.hpp" +#include "docker/executor.hpp" + #include "logging/flags.hpp" #include "logging/logging.hpp"
