aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorYin Huai <yhuai@databricks.com>2015-07-02 22:09:07 -0700
committerYin Huai <yhuai@databricks.com>2015-07-02 22:09:07 -0700
commitf743c79abe5a2fb66be32a896ea47e858569b0c7 (patch)
tree0c88a950211061f9a0318386050caf909ef77482 /launcher
parenta59d14f623633c7aef97991341b587c11ca42328 (diff)
downloadspark-f743c79abe5a2fb66be32a896ea47e858569b0c7.tar.gz
spark-f743c79abe5a2fb66be32a896ea47e858569b0c7.tar.bz2
spark-f743c79abe5a2fb66be32a896ea47e858569b0c7.zip
[SPARK-8776] Increase the default MaxPermSize
I am increasing the perm gen size to 256m. https://issues.apache.org/jira/browse/SPARK-8776 Author: Yin Huai <yhuai@databricks.com> Closes #7196 from yhuai/SPARK-8776 and squashes the following commits: 60901b4 [Yin Huai] Fix test. d44b713 [Yin Huai] Make sparkShell and hiveConsole use 256m PermGen size. 30aaf8e [Yin Huai] Increase the default PermGen size to 256m.
Diffstat (limited to 'launcher')
-rw-r--r--launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java2
-rw-r--r--launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
index 33d65d13f0..5e793a5c48 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -136,7 +136,7 @@ abstract class AbstractCommandBuilder {
}
}
- cmd.add("-XX:MaxPermSize=128m");
+ cmd.add("-XX:MaxPermSize=256m");
}
void addOptionString(List<String> cmd, String options) {
diff --git a/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java b/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java
index 97043a76cc..7329ac9f7f 100644
--- a/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java
+++ b/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java
@@ -194,7 +194,7 @@ public class SparkSubmitCommandBuilderSuite {
if (isDriver) {
assertEquals("-XX:MaxPermSize=256m", arg);
} else {
- assertEquals("-XX:MaxPermSize=128m", arg);
+ assertEquals("-XX:MaxPermSize=256m", arg);
}
}
}