You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/05 18:23:56 UTC
mesos git commit: Fixed parsing docker image env vars.
Repository: mesos
Updated Branches:
refs/heads/master 6585238e9 -> 889d7e173
Fixed parsing docker image env vars.
Allow equal character in the value of environemnt variables.
Review: https://reviews.apache.org/r/43193/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/889d7e17
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/889d7e17
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/889d7e17
Branch: refs/heads/master
Commit: 889d7e1731173fd717d581df675177707060beea
Parents: 6585238
Author: Shuai Lin <li...@gmail.com>
Authored: Fri Feb 5 09:22:09 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 5 09:22:09 2016 -0800
----------------------------------------------------------------------
src/docker/docker.cpp | 2 +-
src/tests/containerizer/docker_tests.cpp | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/889d7e17/src/docker/docker.cpp
----------------------------------------------------------------------
diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp
index b4b8d3e..5272870 100755
--- a/src/docker/docker.cpp
+++ b/src/docker/docker.cpp
@@ -383,7 +383,7 @@ Try<Docker::Image> Docker::Image::create(const JSON::Object& json)
}
const vector<string> tokens =
- strings::tokenize(value.as<JSON::String>().value, "=");
+ strings::split(value.as<JSON::String>().value, "=", 2);
if (tokens.size() != 2) {
return Error("Unexpected Env format for 'ContainerConfig.Env'");
http://git-wip-us.apache.org/repos/asf/mesos/blob/889d7e17/src/tests/containerizer/docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_tests.cpp b/src/tests/containerizer/docker_tests.cpp
index f0ad20e..6208193 100644
--- a/src/tests/containerizer/docker_tests.cpp
+++ b/src/tests/containerizer/docker_tests.cpp
@@ -504,6 +504,7 @@ TEST_F(DockerImageTest, ParseInspectonImage)
" \"LANG=C.UTF-8\","
" \"JAVA_VERSION=8u66\","
" \"JAVA_DEBIAN_VERSION=8u66-b01-1~bpo8+1\","
+ " \"SPARK_OPTS=--driver-java-options=-Xms1024M --driver-java-options=-Xmx4096M --driver-java-options=-Dlog4j.logLevel=info\"," // NOLINT(whitespace/line_length)
" \"CA_CERTIFICATES_JAVA_VERSION=20140324\""
" ],"
" \"Cmd\": ["
@@ -544,6 +545,7 @@ TEST_F(DockerImageTest, ParseInspectonImage)
" \"LANG=C.UTF-8\","
" \"JAVA_VERSION=8u66\","
" \"JAVA_DEBIAN_VERSION=8u66-b01-1~bpo8+1\","
+ " \"SPARK_OPTS=--driver-java-options=-Xms1024M --driver-java-options=-Xmx4096M --driver-java-options=-Dlog4j.logLevel=info\"," // NOLINT(whitespace/line_length)
" \"CA_CERTIFICATES_JAVA_VERSION=20140324\""
" ],"
" \"Cmd\": null,"
@@ -577,6 +579,10 @@ TEST_F(DockerImageTest, ParseInspectonImage)
EXPECT_EQ("8u66", image.get().environment.get().at("JAVA_VERSION"));
EXPECT_EQ("8u66-b01-1~bpo8+1",
image.get().environment.get().at("JAVA_DEBIAN_VERSION"));
+ EXPECT_EQ("--driver-java-options=-Xms1024M "
+ "--driver-java-options=-Xmx4096M "
+ "--driver-java-options=-Dlog4j.logLevel=info",
+ image.get().environment.get().at("SPARK_OPTS"));
EXPECT_EQ("20140324",
image.get().environment.get().at("CA_CERTIFICATES_JAVA_VERSION"));
}