Repository: mesos Updated Branches: refs/heads/1.2.x 314607f9c -> a62d0155f
Renamed 'SubprocessInfo' to 'ContainerIO' in 'ContainerLogger'. Renamed 'SubprocessInfo' to 'ContainerIO' in 'ContainerLogger'. Review: https://reviews.apache.org/r/57121/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8ce59b64 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8ce59b64 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8ce59b64 Branch: refs/heads/1.2.x Commit: 8ce59b64bb197e4c53da678788628916177ec49b Parents: 314607f Author: Kevin Klues <[email protected]> Authored: Wed Mar 1 09:55:13 2017 -0800 Committer: Kevin Klues <[email protected]> Committed: Wed Mar 1 10:31:02 2017 -0800 ---------------------------------------------------------------------- include/mesos/slave/container_logger.hpp | 16 ++++++------ src/slave/container_loggers/lib_logrotate.cpp | 14 +++++------ src/slave/container_loggers/lib_logrotate.hpp | 2 +- src/slave/container_loggers/sandbox.cpp | 14 +++++------ src/slave/container_loggers/sandbox.hpp | 2 +- src/slave/containerizer/docker.cpp | 12 ++++----- .../containerizer/mesos/io/switchboard.cpp | 26 ++++++++++---------- .../containerizer/mesos/io/switchboard.hpp | 2 +- src/tests/container_logger_tests.cpp | 4 +-- 9 files changed, 46 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/include/mesos/slave/container_logger.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/slave/container_logger.hpp b/include/mesos/slave/container_logger.hpp index a3f619b..2ede5f2 100644 --- a/include/mesos/slave/container_logger.hpp +++ b/include/mesos/slave/container_logger.hpp @@ -55,7 +55,7 @@ public: * A collection of `process::subprocess` arguments which the container logger * can influence. See `ContainerLogger::prepare`. */ - struct SubprocessInfo + struct ContainerIO { /** * Describes how the container logger redirects I/O for stdout/stderr. @@ -127,12 +127,12 @@ public: * How to redirect the stdout of the executable. * See `process::Subprocess::IO`. */ - IO out = SubprocessInfo::IO::FD(STDOUT_FILENO); + IO out = IO::FD(STDOUT_FILENO); /** * Similar to `out`, except this describes how to redirect stderr. */ - IO err = SubprocessInfo::IO::FD(STDERR_FILENO); + IO err = IO::FD(STDERR_FILENO); }; /** @@ -162,10 +162,10 @@ public: * * The container logger is given some of the arguments which the containerizer * will use to launch a container. The container logger should return a - * `SubprocessInfo` which tells the containerizer how to handle the stdout - * and stderr of the subprocess. The container logger can modify the fields - * within the `SubprocessInfo` as much as necessary, with some exceptions; - * see the struct `SubprocessInfo` above. + * `ContainerIO` which tells the containerizer how to handle the stdout + * and stderr of the container. The container logger can modify the fields + * within the `ContainerIO` as much as necessary, with some exceptions; + * see the struct `ContainerIO` above. * * NOTE: The container logger should not lose stdout/stderr if the agent * fails over. Additionally, if the container logger is stateful, the logger @@ -178,7 +178,7 @@ public: * executor's sandbox, such as persistent state between agent failovers. * NOTE: All files in the sandbox are exposed via the `/files` endpoint. */ - virtual process::Future<SubprocessInfo> prepare( + virtual process::Future<ContainerIO> prepare( const ExecutorInfo& executorInfo, const std::string& sandboxDirectory, const Option<std::string>& user) = 0; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/slave/container_loggers/lib_logrotate.cpp ---------------------------------------------------------------------- diff --git a/src/slave/container_loggers/lib_logrotate.cpp b/src/slave/container_loggers/lib_logrotate.cpp index b257f48..5dc7d53 100644 --- a/src/slave/container_loggers/lib_logrotate.cpp +++ b/src/slave/container_loggers/lib_logrotate.cpp @@ -59,7 +59,7 @@ namespace mesos { namespace internal { namespace logger { -using SubprocessInfo = ContainerLogger::SubprocessInfo; +using ContainerIO = ContainerLogger::ContainerIO; class LogrotateContainerLoggerProcess : @@ -71,7 +71,7 @@ public: // Spawns two subprocesses that read from their stdin and write to // "stdout" and "stderr" files in the sandbox. The subprocesses will rotate // the files according to the configured maximum size and number of files. - Future<SubprocessInfo> prepare( + Future<ContainerIO> prepare( const ExecutorInfo& executorInfo, const std::string& sandboxDirectory, const Option<std::string>& user) @@ -252,10 +252,10 @@ public: } // NOTE: The ownership of these FDs is given to the caller of this function. - ContainerLogger::SubprocessInfo info; - info.out = SubprocessInfo::IO::FD(outfds.write.get()); - info.err = SubprocessInfo::IO::FD(errfds.write.get()); - return info; + ContainerIO io; + io.out = ContainerIO::IO::FD(outfds.write.get()); + io.err = ContainerIO::IO::FD(errfds.write.get()); + return io; } protected: @@ -285,7 +285,7 @@ Try<Nothing> LogrotateContainerLogger::initialize() } -Future<SubprocessInfo> LogrotateContainerLogger::prepare( +Future<ContainerIO> LogrotateContainerLogger::prepare( const ExecutorInfo& executorInfo, const std::string& sandboxDirectory, const Option<std::string>& user) http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/slave/container_loggers/lib_logrotate.hpp ---------------------------------------------------------------------- diff --git a/src/slave/container_loggers/lib_logrotate.hpp b/src/slave/container_loggers/lib_logrotate.hpp index e37d99c..5e22ef8 100644 --- a/src/slave/container_loggers/lib_logrotate.hpp +++ b/src/slave/container_loggers/lib_logrotate.hpp @@ -195,7 +195,7 @@ public: // This is a noop. The logrotate container logger has nothing to initialize. virtual Try<Nothing> initialize(); - virtual process::Future<mesos::slave::ContainerLogger::SubprocessInfo> + virtual process::Future<mesos::slave::ContainerLogger::ContainerIO> prepare( const ExecutorInfo& executorInfo, const std::string& sandboxDirectory, http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/slave/container_loggers/sandbox.cpp ---------------------------------------------------------------------- diff --git a/src/slave/container_loggers/sandbox.cpp b/src/slave/container_loggers/sandbox.cpp index b55e089..ec0b532 100644 --- a/src/slave/container_loggers/sandbox.cpp +++ b/src/slave/container_loggers/sandbox.cpp @@ -45,7 +45,7 @@ namespace mesos { namespace internal { namespace slave { -using SubprocessInfo = ContainerLogger::SubprocessInfo; +using ContainerIO = ContainerLogger::ContainerIO; class SandboxContainerLoggerProcess : @@ -55,17 +55,17 @@ public: SandboxContainerLoggerProcess() : ProcessBase(process::ID::generate("sandbox-logger")) {} - process::Future<ContainerLogger::SubprocessInfo> prepare( + process::Future<ContainerLogger::ContainerIO> prepare( const ExecutorInfo& executorInfo, const std::string& sandboxDirectory, const Option<std::string>& user) { - ContainerLogger::SubprocessInfo info; + ContainerIO io; - info.out = SubprocessInfo::IO::PATH(path::join(sandboxDirectory, "stdout")); - info.err = SubprocessInfo::IO::PATH(path::join(sandboxDirectory, "stderr")); + io.out = ContainerIO::IO::PATH(path::join(sandboxDirectory, "stdout")); + io.err = ContainerIO::IO::PATH(path::join(sandboxDirectory, "stderr")); - return info; + return io; } }; @@ -90,7 +90,7 @@ Try<Nothing> SandboxContainerLogger::initialize() } -Future<ContainerLogger::SubprocessInfo> +Future<ContainerLogger::ContainerIO> SandboxContainerLogger::prepare( const ExecutorInfo& executorInfo, const std::string& sandboxDirectory, http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/slave/container_loggers/sandbox.hpp ---------------------------------------------------------------------- diff --git a/src/slave/container_loggers/sandbox.hpp b/src/slave/container_loggers/sandbox.hpp index 4ec090c..9042cd5 100644 --- a/src/slave/container_loggers/sandbox.hpp +++ b/src/slave/container_loggers/sandbox.hpp @@ -58,7 +58,7 @@ public: // Tells the subprocess to redirect the executor/task's stdout and stderr // to separate "stdout" and "stderr" files in the sandbox. // The `path`, `argv`, and `environment` are not changed. - virtual process::Future<mesos::slave::ContainerLogger::SubprocessInfo> + virtual process::Future<mesos::slave::ContainerLogger::ContainerIO> prepare( const ExecutorInfo& executorInfo, const std::string& sandboxDirectory, http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 886528f..979cdfe 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -1319,7 +1319,7 @@ Future<Docker::Container> DockerContainerizerProcess::launchExecutorContainer( container->user) .then(defer( self(), - [=](const ContainerLogger::SubprocessInfo& subprocessInfo) + [=](const ContainerLogger::ContainerIO& containerIO) -> Future<Docker::Container> { // Start the executor in a Docker container. // This executor could either be a custom executor specified by an @@ -1333,8 +1333,8 @@ Future<Docker::Container> DockerContainerizerProcess::launchExecutorContainer( container->resources, container->environment, None(), // No extra devices. - subprocessInfo.out, - subprocessInfo.err); + containerIO.out, + containerIO.err); // It's possible that 'run' terminates before we're able to // obtain an 'inspect' result. It's also possible that 'run' @@ -1432,7 +1432,7 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess( })) .then(defer( self(), - [=](const ContainerLogger::SubprocessInfo& subprocessInfo) + [=](const ContainerLogger::ContainerIO& containerIO) -> Future<pid_t> { // NOTE: The child process will be blocked until all hooks have been // executed. @@ -1482,8 +1482,8 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess( path::join(flags.launcher_dir, MESOS_DOCKER_EXECUTOR), argv, Subprocess::PIPE(), - subprocessInfo.out, - subprocessInfo.err, + containerIO.out, + containerIO.err, &launchFlags, environment, None(), http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/slave/containerizer/mesos/io/switchboard.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/io/switchboard.cpp b/src/slave/containerizer/mesos/io/switchboard.cpp index 820d53b..c9e6f63 100644 --- a/src/slave/containerizer/mesos/io/switchboard.cpp +++ b/src/slave/containerizer/mesos/io/switchboard.cpp @@ -290,7 +290,7 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::prepare( Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare( const ContainerID& containerId, const ContainerConfig& containerConfig, - const ContainerLogger::SubprocessInfo& loggerInfo) + const ContainerLogger::ContainerIO& loggerIO) { // On windows, we do not yet support running an io switchboard // server, so we must error out if it is required. @@ -310,31 +310,31 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare( ContainerIO* out = launchInfo.mutable_out(); ContainerIO* err = launchInfo.mutable_err(); - switch (loggerInfo.out.type()) { + switch (loggerIO.out.type()) { #ifndef __WINDOWS__ - case ContainerLogger::SubprocessInfo::IO::Type::FD: + case ContainerLogger::ContainerIO::IO::Type::FD: out->set_type(ContainerIO::FD); - out->set_fd(loggerInfo.out.fd().get()); + out->set_fd(loggerIO.out.fd().get()); break; #endif - case ContainerLogger::SubprocessInfo::IO::Type::PATH: + case ContainerLogger::ContainerIO::IO::Type::PATH: out->set_type(ContainerIO::PATH); - out->set_path(loggerInfo.out.path().get()); + out->set_path(loggerIO.out.path().get()); break; default: UNREACHABLE(); } - switch (loggerInfo.err.type()) { + switch (loggerIO.err.type()) { #ifndef __WINDOWS__ - case ContainerLogger::SubprocessInfo::IO::Type::FD: + case ContainerLogger::ContainerIO::IO::Type::FD: err->set_type(ContainerIO::FD); - err->set_fd(loggerInfo.err.fd().get()); + err->set_fd(loggerIO.err.fd().get()); break; #endif - case ContainerLogger::SubprocessInfo::IO::Type::PATH: + case ContainerLogger::ContainerIO::IO::Type::PATH: err->set_type(ContainerIO::PATH); - err->set_path(loggerInfo.err.path().get()); + err->set_path(loggerIO.err.path().get()); break; default: UNREACHABLE(); @@ -588,8 +588,8 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare( path::join(flags.launcher_dir, IOSwitchboardServer::NAME), {IOSwitchboardServer::NAME}, Subprocess::PATH("/dev/null"), - loggerInfo.out, - loggerInfo.err, + loggerIO.out, + loggerIO.err, &switchboardFlags, environment, None(), http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/slave/containerizer/mesos/io/switchboard.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/io/switchboard.hpp b/src/slave/containerizer/mesos/io/switchboard.hpp index 5b1fa25..7189602 100644 --- a/src/slave/containerizer/mesos/io/switchboard.hpp +++ b/src/slave/containerizer/mesos/io/switchboard.hpp @@ -105,7 +105,7 @@ private: process::Future<Option<mesos::slave::ContainerLaunchInfo>> _prepare( const ContainerID& containerId, const mesos::slave::ContainerConfig& containerConfig, - const mesos::slave::ContainerLogger::SubprocessInfo& loggerInfo); + const mesos::slave::ContainerLogger::ContainerIO& loggerIO); process::Future<process::http::Connection> _connect( const ContainerID& containerId) const; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce59b64/src/tests/container_logger_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/container_logger_tests.cpp b/src/tests/container_logger_tests.cpp index 589d6a9..0a19ac2 100644 --- a/src/tests/container_logger_tests.cpp +++ b/src/tests/container_logger_tests.cpp @@ -115,7 +115,7 @@ public: // All output is redirected to STDOUT_FILENO and STDERR_FILENO. EXPECT_CALL(*this, prepare(_, _, _)) - .WillRepeatedly(Return(mesos::slave::ContainerLogger::SubprocessInfo())); + .WillRepeatedly(Return(mesos::slave::ContainerLogger::ContainerIO())); } virtual ~MockContainerLogger() {} @@ -124,7 +124,7 @@ public: MOCK_METHOD3( prepare, - Future<mesos::slave::ContainerLogger::SubprocessInfo>( + Future<mesos::slave::ContainerLogger::ContainerIO>( const ExecutorInfo&, const string&, const Option<string>&)); };
