Added extrakavaoptions for executors

alexjbush · Jan 19, 2018 · fefc6dd · fefc6dd
1 parent 0cb6c5e
commit fefc6dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/zeppelin-csd-src/aux/client/interpreter.livy.json b/zeppelin-csd-src/aux/client/interpreter.livy.json
@@ -5,6 +5,7 @@
       "properties": {
         "zeppelin.livy.pull_status.interval.millis": "1000",
         "livy.spark.executor.memory": "{{EXECUTOR_MEMORY}}",
+        "livy.spark.executor.extraJavaOptions": "{{EXECUTOR_EXTRA_OPTIONS}}",
         "zeppelin.livy.session.create_timeout": "120",
         "zeppelin.livy.principal": "{{LIVY_PRINCIPAL}}",
         "zeppelin.livy.spark.sql.maxResult": "1000",

diff --git a/zeppelin-csd-src/descriptor/service.sdl b/zeppelin-csd-src/descriptor/service.sdl
@@ -63,6 +63,7 @@
         "environmentVariables": {
           "DRIVER_MEMORY": "${driver_memory}",
           "EXECUTOR_MEMORY": "${executor_memory}",
+          "EXECUTOR_EXTRA_OPTIONS": "${executor_extra_options}",
           "MAX_EXECUTORS": "${max_executors}",
           "ZEPPELIN_LOG_DIR": "${log_dir}",
           "INTERPRETER_FOR_NOTE": "${interpreter_for_note}",
@@ -148,6 +149,14 @@
           "type": "string",
           "default": ""
         },
+        {
+          "name": "executor_extra_options",
+          "label": "Spark Executor Extra Java Options",
+          "description": "A string of extra JVM options to pass to executors. For instance, GC settings or other logging.",
+          "required": "false",
+          "type": "string",
+          "default": ""
+        },
         {
           "name": "zeppelin_shiro_enabled",
           "label": "Shiro Enabled",

diff --git a/zeppelin-csd-src/scripts/control.sh b/zeppelin-csd-src/scripts/control.sh
@@ -75,6 +75,7 @@ case $1 in
         LIVY_TEMP_CONF="$ZEPPELIN_CONF_DIR/interpreter.livy.json.$SPARK_VERSION"
         cp "$ZEPPELIN_CONF_DIR/interpreter.livy.json" "$LIVY_TEMP_CONF"
         sed -i "s#{{EXECUTOR_MEMORY}}#$EXECUTOR_MEMORY#g" "$LIVY_TEMP_CONF"
+        sed -i "s#{{EXECUTOR_EXTRA_OPTIONS}}#$EXECUTOR_EXTRA_OPTIONS#g" "$LIVY_TEMP_CONF"
         sed -i "s#{{MAX_EXECUTORS}}#$MAX_EXECUTORS#g" "$LIVY_TEMP_CONF"
         sed -i "s#{{DRIVER_MEMORY}}#$DRIVER_MEMORY#g" "$LIVY_TEMP_CONF"
         sed -i "s#{{LIVY_URL}}#$LIVY_URL#g" "$LIVY_TEMP_CONF"