You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2016/11/28 16:13:57 UTC
[2/2] mesos git commit: Fixed some nits in hooks interfaces.
Fixed some nits in hooks interfaces.
Review: https://reviews.apache.org/r/54068/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dadb22bd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dadb22bd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dadb22bd
Branch: refs/heads/master
Commit: dadb22bd68da10433bcda4d9d0e9c54d4e75ed7a
Parents: 8509a6d
Author: Till Toenshoff <to...@me.com>
Authored: Mon Nov 28 16:57:08 2016 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Mon Nov 28 16:57:08 2016 +0100
----------------------------------------------------------------------
include/mesos/hook.hpp | 18 +++++++++---------
src/examples/test_hook_module.cpp | 14 +++++++-------
src/hook/manager.cpp | 16 ++++++++--------
src/hook/manager.hpp | 8 ++++----
4 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dadb22bd/include/mesos/hook.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/hook.hpp b/include/mesos/hook.hpp
index 3ad5933..134951c 100644
--- a/include/mesos/hook.hpp
+++ b/include/mesos/hook.hpp
@@ -103,8 +103,8 @@ public:
// If there is a conflict, the hook loaded last will take priority.
//
// NOTE: Unlike `slaveExecutorEnvironmentDecorator`, environment variables
- // returned from this hook *will* overwrite environment variables inside
- // the `ExecutorInfo`.
+ // returned from this hook, in case of conflicts, *will* overwrite
+ // environment variables inside the `ExecutorInfo`.
//
// NOTE: This hook is designed to be an asynchronous replacement for
// `slavePreLaunchDockerHook`. This hook is called first.
@@ -114,9 +114,9 @@ public:
slavePreLaunchDockerEnvironmentDecorator(
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
- const std::string& name,
- const std::string& sandboxDirectory,
- const std::string& mappedDirectory,
+ const std::string& containerName,
+ const std::string& containerWorkDirectory,
+ const std::string& mappedSandboxDirectory,
const Option<std::map<std::string, std::string>>& env)
{
return None();
@@ -157,15 +157,15 @@ public:
// A typical module implementing the hook will perform some settings
// as required.
//
- // NOTE: Superceded by `slavePreLaunchDockerEnvironmentDecorator`.
+ // NOTE: Superseded by `slavePreLaunchDockerEnvironmentDecorator`.
virtual Try<Nothing> slavePreLaunchDockerHook(
const ContainerInfo& containerInfo,
const CommandInfo& commandInfo,
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
- const std::string& name,
- const std::string& sandboxDirectory,
- const std::string& mappedDirectory,
+ const std::string& containerName,
+ const std::string& containerWorkDirectory,
+ const std::string& mappedSandboxDirectory,
const Option<Resources>& resources,
const Option<std::map<std::string, std::string>>& env)
{
http://git-wip-us.apache.org/repos/asf/mesos/blob/dadb22bd/src/examples/test_hook_module.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_hook_module.cpp b/src/examples/test_hook_module.cpp
index 5e91a71..094a92b 100644
--- a/src/examples/test_hook_module.cpp
+++ b/src/examples/test_hook_module.cpp
@@ -193,9 +193,9 @@ public:
virtual Future<Option<Environment>> slavePreLaunchDockerEnvironmentDecorator(
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
- const string& name,
- const string& sandboxDirectory,
- const string& mappedDirectory,
+ const string& containerName,
+ const string& containerWorkDirectory,
+ const string& mappedSandboxDirectory,
const Option<map<string, string>>& env)
{
LOG(INFO) << "Executing 'slavePreLaunchDockerEnvironmentDecorator' hook";
@@ -222,14 +222,14 @@ public:
const CommandInfo& commandInfo,
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
- const string& name,
- const string& sandboxDirectory,
- const string& mappedDirectory,
+ const string& containerName,
+ const string& containerWorkDirectory,
+ const string& mappedSandboxDirectory,
const Option<Resources>& resources,
const Option<map<string, string>>& env)
{
LOG(INFO) << "Executing 'slavePreLaunchDockerHook'";
- return os::touch(path::join(sandboxDirectory, "foo"));
+ return os::touch(path::join(containerWorkDirectory, "foo"));
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dadb22bd/src/hook/manager.cpp
----------------------------------------------------------------------
diff --git a/src/hook/manager.cpp b/src/hook/manager.cpp
index 1923d0b..59f402b 100644
--- a/src/hook/manager.cpp
+++ b/src/hook/manager.cpp
@@ -257,8 +257,8 @@ Future<map<string, string>>
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
const string& containerName,
- const string& sandboxDirectory,
- const string& mappedDirectory,
+ const string& containerWorkDirectory,
+ const string& mappedSandboxDirectory,
const Option<map<string, string>>& env)
{
// We execute these hooks according to their ordering so any conflicting
@@ -275,8 +275,8 @@ Future<map<string, string>>
taskInfo,
executorInfo,
containerName,
- sandboxDirectory,
- mappedDirectory,
+ containerWorkDirectory,
+ mappedSandboxDirectory,
env));
}
@@ -307,8 +307,8 @@ void HookManager::slavePreLaunchDockerHook(
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
const string& containerName,
- const string& sandboxDirectory,
- const string& mappedDirectory,
+ const string& containerWorkDirectory,
+ const string& mappedSandboxDirectory,
const Option<Resources>& resources,
const Option<map<string, string>>& env)
{
@@ -321,8 +321,8 @@ void HookManager::slavePreLaunchDockerHook(
taskInfo,
executorInfo,
containerName,
- sandboxDirectory,
- mappedDirectory,
+ containerWorkDirectory,
+ mappedSandboxDirectory,
resources,
env);
if (result.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/dadb22bd/src/hook/manager.hpp
----------------------------------------------------------------------
diff --git a/src/hook/manager.hpp b/src/hook/manager.hpp
index d67d938..ad52717 100644
--- a/src/hook/manager.hpp
+++ b/src/hook/manager.hpp
@@ -61,8 +61,8 @@ public:
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
const std::string& containerName,
- const std::string& sandboxDirectory,
- const std::string& mappedDirectory,
+ const std::string& containerWorkDirectory,
+ const std::string& mappedSandboxDirectory,
const Option<std::map<std::string, std::string>>& env);
static process::Future<DockerTaskExecutorPrepareInfo>
@@ -80,8 +80,8 @@ public:
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
const std::string& containerName,
- const std::string& sandboxDirectory,
- const std::string& mappedDirectory,
+ const std::string& containerWorkDirectory,
+ const std::string& mappedSandboxDirectory,
const Option<Resources>& resources,
const Option<std::map<std::string, std::string>>& env);