Merge pull request pentaho#3791 from rfellows/dev

[BACKLOG-15669] - Updating the memory requirements for the spark-app-…
lehedrn · Apr 21, 2017 · 0fa9e53 · 0fa9e53
2 parents fdc9641 + bb988d8
commit 0fa9e53
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/assembly/package-res/Spark-app-builder.bat b/assembly/package-res/Spark-app-builder.bat
@@ -3,5 +3,8 @@ setlocal
 SET initialDir=%cd%
 pushd %~dp0
 SET SPOON_CONSOLE=1
+
+if "%PENTAHO_DI_JAVA_OPTIONS%"=="" set "PENTAHO_DI_JAVA_OPTIONS=-Xms1024m -Xmx3072m -XX:MaxPermSize=256m"
+
 call Spoon.bat -main org.pentaho.pdi.spark.driver.app.builder.SparkDriverAppBuilder %*
 popd
diff --git a/assembly/package-res/spark-app-builder.sh b/assembly/package-res/spark-app-builder.sh
@@ -6,4 +6,8 @@ cd "$BASEDIR"
 DIR="`pwd`"
 cd - > /dev/null
 
+if [ -z "$PENTAHO_DI_JAVA_OPTIONS" ]; then
+	export PENTAHO_DI_JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MaxPermSize=256m"
+fi
+
 "$DIR/spoon.sh" -main org.pentaho.pdi.spark.driver.app.builder.SparkDriverAppBuilder "$@"