Merge pull request #107 from jornfranke/main

Fix: #66
InseeFrLab · Feb 12, 2024 · 0ffb93b · 0ffb93b
2 parents 1d4bd69 + bd9cc5f
commit 0ffb93b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/fr/insee/trevas/jupyter/SparkUtils.java b/src/main/java/fr/insee/trevas/jupyter/SparkUtils.java
@@ -28,15 +28,18 @@ public static SparkSession buildSparkSession() {
         SparkConf conf = new SparkConf(true);
         String spark_home = System.getenv("SPARK_HOME") + "/conf";
         Path path = Path.of(spark_home, "spark-defaults.conf");
-        if (Files.exists(path)) {
+          if (Files.exists(path)) {
+            org.apache.spark.util.Utils.loadDefaultSparkProperties(conf, path.normalize().toAbsolutePath().toString());
+             if (conf.get("spark.jars","").equals("")) {
              conf.set("spark.jars", String.join(",",
                     "/vtl-spark.jar",
                     "/vtl-model.jar",
                     "/vtl-parser.jar",
                     "/vtl-engine.jar"
             ));
-            org.apache.spark.util.Utils.loadDefaultSparkProperties(conf, path.normalize().toAbsolutePath().toString());
-        } else {
+         }
+        }
+        else {
             sparkBuilder.master("local");
         }
         return sparkBuilder.config(conf).getOrCreate();