diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-05-19 18:42:28 -0700 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2014-05-19 18:42:47 -0700 |
| commit | 00563e15e3281e0efa67c0ed3c62f77c5ee66f94 (patch) | |
| tree | 2ea4ab4cdab3ad6477ed012620f1dfc272a36630 /bin/spark-class | |
| parent | 901102c1ba5f800705819916f2b7a38b6750cffb (diff) | |
| download | spark-00563e15e3281e0efa67c0ed3c62f77c5ee66f94.tar.gz spark-00563e15e3281e0efa67c0ed3c62f77c5ee66f94.tar.bz2 spark-00563e15e3281e0efa67c0ed3c62f77c5ee66f94.zip | |
SPARK-1879. Increase MaxPermSize since some of our builds have many classes
See https://issues.apache.org/jira/browse/SPARK-1879 -- builds with Hadoop2 and Hive ran out of PermGen space in spark-shell, when those things added up with the Scala compiler.
Note that users can still override it by setting their own Java options with this change. Their options will come later in the command string than the -XX:MaxPermSize=128m.
Author: Matei Zaharia <matei@databricks.com>
Closes #823 from mateiz/spark-1879 and squashes the following commits:
6bc0ee8 [Matei Zaharia] Increase MaxPermSize to 128m since some of our builds have lots of classes
(cherry picked from commit 5af99d7617ba3b9fbfdb345ef9571b7dd41f45a1)
Signed-off-by: Tathagata Das <tathagata.das1565@gmail.com>
Diffstat (limited to 'bin/spark-class')
| -rwxr-xr-x | bin/spark-class | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/spark-class b/bin/spark-class index 6480ccb58d..2e57295fd0 100755 --- a/bin/spark-class +++ b/bin/spark-class @@ -99,14 +99,14 @@ else fi # Set JAVA_OPTS to be able to load native libraries and to set heap size -JAVA_OPTS="$OUR_JAVA_OPTS" +JAVA_OPTS="-XX:MaxPermSize=128m $OUR_JAVA_OPTS" JAVA_OPTS="$JAVA_OPTS -Xms$OUR_JAVA_MEM -Xmx$OUR_JAVA_MEM" # Load extra JAVA_OPTS from conf/java-opts, if it exists if [ -e "$FWDIR/conf/java-opts" ] ; then JAVA_OPTS="$JAVA_OPTS `cat $FWDIR/conf/java-opts`" fi export JAVA_OPTS -# Attention: when changing the way the JAVA_OPTS are assembled, the change must be reflected in ExecutorRunner.scala! +# Attention: when changing the way the JAVA_OPTS are assembled, the change must be reflected in CommandUtils.scala! if [ ! -f "$FWDIR/RELEASE" ]; then # Exit if the user hasn't compiled Spark |