spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From van...@apache.org
Subject spark git commit: [SPARK-15531][DEPLOY] spark-class tries to use too much memory when running Launcher
Date Fri, 27 May 2016 18:28:45 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-2.0 30e87b55b -> 074989af9


[SPARK-15531][DEPLOY] spark-class tries to use too much memory when running Launcher

## What changes were proposed in this pull request?

Explicitly limit launcher JVM memory to modest 128m

## How was this patch tested?

Jenkins tests.

Author: Sean Owen <sowen@cloudera.com>

Closes #13360 from srowen/SPARK-15531.

(cherry picked from commit 623aae5907f4ba8b7079c21328e0c0b5fef7bb00)
Signed-off-by: Marcelo Vanzin <vanzin@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/074989af
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/074989af
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/074989af

Branch: refs/heads/branch-2.0
Commit: 074989af945b8ebb2779f94b8714752b67f3e82f
Parents: 30e87b5
Author: Sean Owen <sowen@cloudera.com>
Authored: Fri May 27 11:28:28 2016 -0700
Committer: Marcelo Vanzin <vanzin@cloudera.com>
Committed: Fri May 27 11:28:39 2016 -0700

----------------------------------------------------------------------
 bin/spark-class      | 2 +-
 bin/spark-class2.cmd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/074989af/bin/spark-class
----------------------------------------------------------------------
diff --git a/bin/spark-class b/bin/spark-class
index 23a60c6..658e076 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -68,7 +68,7 @@ fi
 # The exit code of the launcher is appended to the output, so the parent shell removes it
from the
 # command array and checks the value to see if the launcher succeeded.
 build_command() {
-  "$RUNNER" -cp "$LAUNCH_CLASSPATH" org.apache.spark.launcher.Main "$@"
+  "$RUNNER" -Xmx128m -cp "$LAUNCH_CLASSPATH" org.apache.spark.launcher.Main "$@"
   printf "%d\0" $?
 }
 

http://git-wip-us.apache.org/repos/asf/spark/blob/074989af/bin/spark-class2.cmd
----------------------------------------------------------------------
diff --git a/bin/spark-class2.cmd b/bin/spark-class2.cmd
index db68021..869c0b2 100644
--- a/bin/spark-class2.cmd
+++ b/bin/spark-class2.cmd
@@ -55,7 +55,7 @@ if not "x%JAVA_HOME%"=="x" set RUNNER=%JAVA_HOME%\bin\java
 rem The launcher library prints the command to be executed in a single line suitable for
being
 rem executed by the batch interpreter. So read all the output of the launcher into a variable.
 set LAUNCHER_OUTPUT=%temp%\spark-class-launcher-output-%RANDOM%.txt
-"%RUNNER%" -cp "%LAUNCH_CLASSPATH%" org.apache.spark.launcher.Main %* > %LAUNCHER_OUTPUT%
+"%RUNNER%" -Xmx128m -cp "%LAUNCH_CLASSPATH%" org.apache.spark.launcher.Main %* > %LAUNCHER_OUTPUT%
 for /f "tokens=*" %%i in (%LAUNCHER_OUTPUT%) do (
   set SPARK_CMD=%%i
 )


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message