You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/02/07 16:58:14 UTC
spark git commit: SPARK-5408: Use -XX:MaxPermSize specified by user
instead of default in ...
Repository: spark
Updated Branches:
refs/heads/master e9a4fe12d -> dd4cb33a2
SPARK-5408: Use -XX:MaxPermSize specified by user instead of default in ...
...ExecutorRunner and DriverRunner
Author: Jacek Lewandowski <le...@gmail.com>
Closes #4203 from jacek-lewandowski/SPARK-5408-1.3 and squashes the following commits:
d913686 [Jacek Lewandowski] SPARK-5408: Use -XX:MaxPermSize specified by used instead of default in ExecutorRunner and DriverRunner
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/dd4cb33a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/dd4cb33a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/dd4cb33a
Branch: refs/heads/master
Commit: dd4cb33a271b893adebd5ec46dd349b16b591edc
Parents: e9a4fe1
Author: Jacek Lewandowski <le...@gmail.com>
Authored: Sat Feb 7 15:58:04 2015 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Sat Feb 7 15:58:04 2015 +0000
----------------------------------------------------------------------
.../org/apache/spark/deploy/worker/CommandUtils.scala | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/dd4cb33a/core/src/main/scala/org/apache/spark/deploy/worker/CommandUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/CommandUtils.scala b/core/src/main/scala/org/apache/spark/deploy/worker/CommandUtils.scala
index 28e9662..3e013c3 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/CommandUtils.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/CommandUtils.scala
@@ -115,9 +115,19 @@ object CommandUtils extends Logging {
val userClassPath = command.classPathEntries ++ Seq(classPath)
val javaVersion = System.getProperty("java.version")
- val permGenOpt = if (!javaVersion.startsWith("1.8")) Some("-XX:MaxPermSize=128m") else None
+
+ val javaOpts = workerLocalOpts ++ command.javaOpts
+
+ val permGenOpt =
+ if (!javaVersion.startsWith("1.8") && !javaOpts.exists(_.startsWith("-XX:MaxPermSize="))) {
+ // do not specify -XX:MaxPermSize if it was already specified by user
+ Some("-XX:MaxPermSize=128m")
+ } else {
+ None
+ }
+
Seq("-cp", userClassPath.filterNot(_.isEmpty).mkString(File.pathSeparator)) ++
- permGenOpt ++ workerLocalOpts ++ command.javaOpts ++ memoryOpts
+ permGenOpt ++ javaOpts ++ memoryOpts
}
/** Spawn a thread that will redirect a given stream to a file */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org