Repository: mesos Updated Branches: refs/heads/master 13a4e81df -> d959ea435
Remove os environment for docker executor enviornment setup. Review: https://reviews.apache.org/r/36282 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d959ea43 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d959ea43 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d959ea43 Branch: refs/heads/master Commit: d959ea4359f1105ad6ad6dc59f49bf0ed5a6bb56 Parents: 13a4e81 Author: Timothy Chen <[email protected]> Authored: Tue Jul 7 14:40:34 2015 -0700 Committer: Timothy Chen <[email protected]> Committed: Tue Jul 7 17:24:20 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/containerizer.cpp | 8 +++++--- src/slave/containerizer/containerizer.hpp | 3 ++- src/slave/containerizer/docker.cpp | 6 ++++-- src/slave/containerizer/docker.hpp | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d959ea43/src/slave/containerizer/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/containerizer.cpp b/src/slave/containerizer/containerizer.cpp index 69dfac0..25c87e9 100644 --- a/src/slave/containerizer/containerizer.cpp +++ b/src/slave/containerizer/containerizer.cpp @@ -240,12 +240,12 @@ map<string, string> executorEnvironment( const SlaveID& slaveId, const PID<Slave>& slavePid, bool checkpoint, - const Flags& flags) + const Flags& flags, + bool includeOsEnvironment) { - map<string, string> environment = os::environment(); + map<string, string> environment; if (flags.executor_environment_variables.isSome()) { - environment.clear(); foreachpair (const string& key, const JSON::Value& value, flags.executor_environment_variables.get().values) { @@ -253,6 +253,8 @@ map<string, string> executorEnvironment( CHECK(value.is<JSON::String>()); environment[key] = value.as<JSON::String>().value; } + } else if (includeOsEnvironment) { + environment = os::environment(); } // Set LIBPROCESS_PORT so that we bind to a random free port (since http://git-wip-us.apache.org/repos/asf/mesos/blob/d959ea43/src/slave/containerizer/containerizer.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/containerizer.hpp b/src/slave/containerizer/containerizer.hpp index 0ee17e6..5214554 100644 --- a/src/slave/containerizer/containerizer.hpp +++ b/src/slave/containerizer/containerizer.hpp @@ -148,7 +148,8 @@ std::map<std::string, std::string> executorEnvironment( const SlaveID& slaveId, const process::PID<Slave>& slavePid, bool checkpoint, - const Flags& flags); + const Flags& flags, + bool includeOsEnvironment = true); } // namespace slave { } // namespace internal { http://git-wip-us.apache.org/repos/asf/mesos/blob/d959ea43/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 6eb1c84..cfb6017 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -302,7 +302,8 @@ DockerContainerizerProcess::Container::create( slaveId, slavePid, checkpoint, - flags); + flags, + false); launchesExecutorContainer = true; } @@ -875,7 +876,8 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess( container->slaveId, container->slavePid, container->checkpoint, - flags); + flags, + false); // Include any enviroment variables from ExecutorInfo. foreach (const Environment::Variable& variable, http://git-wip-us.apache.org/repos/asf/mesos/blob/d959ea43/src/slave/containerizer/docker.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.hpp b/src/slave/containerizer/docker.hpp index 646a277..9a7a951 100644 --- a/src/slave/containerizer/docker.hpp +++ b/src/slave/containerizer/docker.hpp @@ -332,7 +332,8 @@ private: slaveId, slavePid, checkpoint, - flags); + flags, + false); } }
