You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/05/30 14:04:36 UTC
spark git commit: [SPARK-7945] [CORE] Do trim to values in properties
file
Repository: spark
Updated Branches:
refs/heads/master 8c8de3ed8 -> 9d8aadb72
[SPARK-7945] [CORE] Do trim to values in properties file
https://issues.apache.org/jira/browse/SPARK-7945
Now applications submited by org.apache.spark.launcher.Main read properties file without doing trim to values in it.
If user left a space after a value(say spark.driver.extraClassPath) then it probably affect global functions(like some jar could not be included in the classpath), so we should do it like Utils.getPropertiesFromFile.
Author: WangTaoTheTonic <wa...@huawei.com>
Author: Tao Wang <wa...@huawei.com>
Closes #6496 from WangTaoTheTonic/SPARK-7945 and squashes the following commits:
bb41b4b [Tao Wang] indent 4 to 2
6dd1cf2 [WangTaoTheTonic] use a simpler way
2c053a1 [WangTaoTheTonic] Do trim to values in properties file
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9d8aadb7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9d8aadb7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9d8aadb7
Branch: refs/heads/master
Commit: 9d8aadb72bbc86595e253fe30201cda6a8db877e
Parents: 8c8de3e
Author: WangTaoTheTonic <wa...@huawei.com>
Authored: Sat May 30 08:04:27 2015 -0400
Committer: Sean Owen <so...@cloudera.com>
Committed: Sat May 30 08:04:27 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/spark/launcher/AbstractCommandBuilder.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9d8aadb7/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
----------------------------------------------------------------------
diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
index 33fd813..33d65d1 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -296,6 +296,9 @@ abstract class AbstractCommandBuilder {
try {
fd = new FileInputStream(propsFile);
props.load(new InputStreamReader(fd, "UTF-8"));
+ for (Map.Entry<Object, Object> e : props.entrySet()) {
+ e.setValue(e.getValue().toString().trim());
+ }
} finally {
if (fd != null) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org