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 2017/05/10 12:44:51 UTC
mesos git commit: Fixed task_environment serializing in containerizer.
Repository: mesos
Updated Branches:
refs/heads/1.2.x 69fae40ac -> fd5d2cf6a
Fixed task_environment serializing in containerizer.
Review: https://reviews.apache.org/r/59140/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fd5d2cf6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fd5d2cf6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fd5d2cf6
Branch: refs/heads/1.2.x
Commit: fd5d2cf6a861a25ad1aefc4a9b359e0ca43db5c9
Parents: 69fae40
Author: Till Toenshoff <to...@me.com>
Authored: Wed May 10 14:42:45 2017 +0200
Committer: Till Toenshoff <to...@me.com>
Committed: Wed May 10 14:42:45 2017 +0200
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fd5d2cf6/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 19d875c..105bcc5 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -1360,8 +1360,15 @@ Future<bool> MesosContainerizerProcess::_launch(
}
if (!commandTaskEnvironment.empty()) {
+ Environment taskEnvironment;
+ foreachpair (
+ const string& name, const string& value, commandTaskEnvironment) {
+ Environment::Variable* variable = taskEnvironment.add_variables();
+ variable->set_name(name);
+ variable->set_value(value);
+ }
launchInfo.mutable_command()->add_arguments(
- "--task_environment=" + string(jsonify(commandTaskEnvironment)));
+ "--task_environment=" + stringify(JSON::protobuf(taskEnvironment)));
}
}