From 4b27cc72bbb87b74c47950a2bd24ef94cfecac8d Mon Sep 17 00:00:00 2001 From: "David Muto (pseudomuto)" Date: Tue, 7 May 2019 21:16:58 -0400 Subject: [PATCH] Don't raise when spark-defaults.conf doesn't exist --- .../java/com/uber/hoodie/cli/utils/SparkUtil.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/SparkUtil.java b/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/SparkUtil.java index 2dd446b8d..3f132deb7 100644 --- a/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/SparkUtil.java +++ b/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/SparkUtil.java @@ -21,6 +21,8 @@ import com.uber.hoodie.cli.commands.SparkMain; import com.uber.hoodie.common.util.FSUtils; import java.io.File; import java.net.URISyntaxException; + +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.spark.SparkConf; import org.apache.spark.api.java.JavaSparkContext; @@ -37,8 +39,13 @@ public class SparkUtil { public static SparkLauncher initLauncher(String propertiesFile) throws URISyntaxException { String currentJar = new File(SparkUtil.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()) .getAbsolutePath(); - SparkLauncher sparkLauncher = new SparkLauncher().setAppResource(currentJar).setMainClass(SparkMain.class.getName()) - .setPropertiesFile(propertiesFile); + SparkLauncher sparkLauncher = new SparkLauncher().setAppResource(currentJar) + .setMainClass(SparkMain.class.getName()); + + if (StringUtils.isNotEmpty(propertiesFile)) { + sparkLauncher.setPropertiesFile(propertiesFile); + } + File libDirectory = new File(new File(currentJar).getParent(), "lib"); for (String library : libDirectory.list()) { sparkLauncher.addJar(new File(libDirectory, library).getAbsolutePath());