From f743c79abe5a2fb66be32a896ea47e858569b0c7 Mon Sep 17 00:00:00 2001
From: Yin Huai <yhuai@databricks.com>
Date: Thu, 2 Jul 2015 22:09:07 -0700
Subject: [PATCH] [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.
---
.../org/apache/spark/launcher/AbstractCommandBuilder.java | 2 +-
.../apache/spark/launcher/SparkSubmitCommandBuilderSuite.java | 2 +-
project/SparkBuild.scala | 4 ++--
3 files changed, 4 insertions(+), 4 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);
}
}
}
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 5f389bcc9c..3408c6d51e 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -206,7 +206,7 @@ object SparkBuild extends PomBuild {
fork := true,
outputStrategy in run := Some (StdoutOutput),
- javaOptions ++= Seq("-Xmx2G", "-XX:MaxPermSize=1g"),
+ javaOptions ++= Seq("-Xmx2G", "-XX:MaxPermSize=256m"),
sparkShell := {
(runMain in Compile).toTask(" org.apache.spark.repl.Main -usejavacp").value
@@ -299,7 +299,7 @@ object SQL {
object Hive {
lazy val settings = Seq(
- javaOptions += "-XX:MaxPermSize=1g",
+ javaOptions += "-XX:MaxPermSize=256m",
// Specially disable assertions since some Hive tests fail them
javaOptions in Test := (javaOptions in Test).value.filterNot(_ == "-ea"),
// Multiple queries rely on the TestHive singleton. See comments there for more details.
--
GitLab