Skip to content

ZEPPELIN-46: set only non-empty values for for spark.* properties #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bzz wants to merge 11 commits into from
Closed

ZEPPELIN-46: set only non-empty values for for spark.* properties #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ae83f4
ZEPPELIN-46: set only non-empty properties for spark.*
Apr 16, 2015
00e4676
ZEPPELIN-46 fixing a typo
Apr 16, 2015
3ff8460
ZEPPELIN-46 adding tests, by @jongyoul
Apr 16, 2015
9d94910
ZEPPELIN-46: make tests pass on local Spark
Apr 17, 2015
5e22509
Resolve conflicts
jongyoul Apr 17, 2015
aec31d3
[ZEPPELIN-46] Some spark env must have a valid value
jongyoul Apr 17, 2015
f259a5a
[ZEPPELIN-46] Some spark env must have a valid value
jongyoul Apr 17, 2015
cd0b4d4
[ZEPPELIN-46] Some spark env must have a valid value
jongyoul Apr 17, 2015
922b523
Merge pull request #1 from jongyoul/ZEPPELIN-46
Apr 17, 2015
50632f1
Merge branch 'master' into fix-non-empty-spark-conf-paraments
bzz Apr 17, 2015
56a5ce1
ZEPPELIN-46: fix style convention
bzz Apr 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,12 @@ public SparkContext createSparkContext() {
new SparkConf()
.setMaster(getProperty("master"))
.setAppName(getProperty("spark.app.name"))
.setJars(jars)
.set("spark.repl.class.uri", classServerUri);

if (jars.length > 0) {
conf.setJars(jars);
}

if (execUri != null) {
conf.set("spark.executor.uri", execUri);
}
Expand All @@ -259,17 +262,19 @@ public SparkContext createSparkContext() {

for (Object k : intpProperty.keySet()) {
String key = (String) k;
Object value = intpProperty.get(key);
logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, value));
conf.set(key, (String) value);
String val = toString(intpProperty.get(key));
if (!key.startsWith("spark.") || !val.trim().isEmpty()) {
Copy link
Member

@felixcheung felixcheung Apr 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about if val is whitespace? eg. " "

Copy link
Member

@jongyoul jongyoul Apr 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@felixcheung trim() will make whitespace removed. Tests case is not covered all of cases. I make a PR of @bzz and he will fix this.

Copy link
Member Author

@bzz bzz Apr 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then val.trim().isEmpty() is true, so it will be set for any property, that does not start with "spark." (i.e whitespace as a password)

logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, val));
conf.set(key, val);
}
}

SparkContext sparkContext = new SparkContext(conf);
return sparkContext;
}

public static boolean isEmptyString(Object val) {
return val instanceof String && ((String) val).trim().isEmpty();
static final String toString(Object o) {
return (o instanceof String) ? (String) o : "";
}

public static String getSystemDefault(
Expand Down
15 changes: 15 additions & 0 deletions spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.LinkedList;
import java.util.Properties;

import org.apache.spark.SparkConf;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.InterpreterContext;
Expand Down Expand Up @@ -138,4 +139,18 @@ public void testZContextDependencyLoading() {
repl.interpret("z.load(\"org.apache.commons:commons-csv:1.1\")", context);
assertEquals(InterpreterResult.Code.SUCCESS, repl.interpret("import org.apache.commons.csv.CSVFormat", context).code());
}

@Test
public void emptyConfigurationVariablesOnlyForNonSparkProperties() {
Properties intpProperty = repl.getProperty();
SparkConf sparkConf = repl.getSparkContext().getConf();
for (Object oKey : intpProperty.keySet()) {
String key = (String) oKey;
String value = (String) intpProperty.get(key);
repl.logger.debug(String.format("[%s]: [%s]", key, value));
if (key.startsWith("spark.") && value.isEmpty()) {
assertTrue(String.format("configuration starting from 'spark.' should not be empty. [%s]", key), !sparkConf.contains(key) || !sparkConf.get(key).isEmpty());
}
}
}
}