You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2020/04/17 20:12:55 UTC
[mesos] 03/03: Updated mesos for os/exec.hpp addition to stout.
This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 898201becb971982d581a67bc351de06804ce411
Author: Benjamin Mahler <bm...@apache.org>
AuthorDate: Fri Mar 27 19:42:46 2020 -0400
Updated mesos for os/exec.hpp addition to stout.
Some of these files were using utilities that are now in os/exec.hpp.
For files that already include os.hpp, they get os/exec.hpp
automatically. However, some files still do fine grained includes
despite including the catch all os.hpp, so we update those files
accordingly.
Review: https://reviews.apache.org/r/72286
---
src/hdfs/hdfs.cpp | 1 -
src/linux/fs.cpp | 2 +-
.../mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp | 1 +
src/slave/containerizer/mesos/launch.cpp | 2 ++
src/tests/containerizer/cgroups_isolator_tests.cpp | 2 ++
src/tests/containerizer/perf_tests.cpp | 3 +--
src/tests/environment.cpp | 1 +
src/uri/fetchers/docker.cpp | 1 +
8 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/hdfs/hdfs.cpp b/src/hdfs/hdfs.cpp
index 1216e08..cc616b1 100644
--- a/src/hdfs/hdfs.cpp
+++ b/src/hdfs/hdfs.cpp
@@ -33,7 +33,6 @@
#include <stout/os/constants.hpp>
#include <stout/os/exists.hpp>
-#include <stout/os/shell.hpp>
#include "common/status_utils.hpp"
#include "hdfs/hdfs.hpp"
diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp
index 7d05716..2e36d3f 100644
--- a/src/linux/fs.cpp
+++ b/src/linux/fs.cpp
@@ -47,9 +47,9 @@ extern "C" {
#include <stout/strings.hpp>
#include <stout/synchronized.hpp>
+#include <stout/os/exec.hpp>
#include <stout/os/read.hpp>
#include <stout/os/realpath.hpp>
-#include <stout/os/shell.hpp>
#include <stout/os/stat.hpp>
#include "common/status_utils.hpp"
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
index 122e9ec..5445470 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
@@ -18,6 +18,7 @@
#include <stout/protobuf.hpp>
#include <stout/stringify.hpp>
+#include <stout/os/exec.hpp>
#include <stout/os/which.hpp>
#include <process/collect.hpp>
diff --git a/src/slave/containerizer/mesos/launch.cpp b/src/slave/containerizer/mesos/launch.cpp
index 2405e31..43dd1ce 100644
--- a/src/slave/containerizer/mesos/launch.cpp
+++ b/src/slave/containerizer/mesos/launch.cpp
@@ -43,9 +43,11 @@
#include <stout/try.hpp>
#include <stout/unreachable.hpp>
+#include <stout/os/exec.hpp>
#include <stout/os/int_fd.hpp>
#include <stout/os/open.hpp>
#include <stout/os/realpath.hpp>
+#include <stout/os/shell.hpp>
#include <stout/os/which.hpp>
#include <stout/os/write.hpp>
diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp b/src/tests/containerizer/cgroups_isolator_tests.cpp
index 9c048c2..aeac274 100644
--- a/src/tests/containerizer/cgroups_isolator_tests.cpp
+++ b/src/tests/containerizer/cgroups_isolator_tests.cpp
@@ -23,6 +23,8 @@
#include <stout/format.hpp>
#include <stout/gtest.hpp>
+#include <stout/os/exec.hpp>
+
#include <mesos/v1/scheduler.hpp>
#include "slave/gc_process.hpp"
diff --git a/src/tests/containerizer/perf_tests.cpp b/src/tests/containerizer/perf_tests.cpp
index 915ad18..2c6985f 100644
--- a/src/tests/containerizer/perf_tests.cpp
+++ b/src/tests/containerizer/perf_tests.cpp
@@ -25,10 +25,9 @@
#include <stout/gtest.hpp>
#include <stout/option.hpp>
-#include <stout/os.hpp>
#include <stout/stringify.hpp>
-#include <stout/os/shell.hpp>
+#include <stout/os/exec.hpp>
#include "common/status_utils.hpp"
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index b9cfe57..737c2d9 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -51,6 +51,7 @@
#include <stout/stringify.hpp>
#include <stout/strings.hpp>
+#include <stout/os/exec.hpp>
#include <stout/os/exists.hpp>
#include <stout/os/pstree.hpp>
#include <stout/os/shell.hpp>
diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp
index 1256294..09feb68 100644
--- a/src/uri/fetchers/docker.cpp
+++ b/src/uri/fetchers/docker.cpp
@@ -32,6 +32,7 @@
#include <stout/strings.hpp>
#include <stout/os/constants.hpp>
+#include <stout/os/exec.hpp>
#include <stout/os/getenv.hpp>
#include <stout/os/kill.hpp>
#include <stout/os/mkdir.hpp>