aboutsummaryrefslogtreecommitdiff
path: root/launcher/src/main/java/org/apache
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2016-05-09 11:10:36 -0700
committerAndrew Or <andrew@databricks.com>2016-05-09 11:10:36 -0700
commit6747171eb19dec57c4076cab32580e42ffeb4f51 (patch)
tree860ba5ca6a48e3fd1c61fa09c925840e71d7de01 /launcher/src/main/java/org/apache
parente083db2e9e87bf8b6c135568c2b4860f772fc277 (diff)
downloadspark-6747171eb19dec57c4076cab32580e42ffeb4f51.tar.gz
spark-6747171eb19dec57c4076cab32580e42ffeb4f51.tar.bz2
spark-6747171eb19dec57c4076cab32580e42ffeb4f51.zip
[SPARK-15067][YARN] YARN executors are launched with fixed perm gen size
## What changes were proposed in this pull request? Look for MaxPermSize arguments anywhere in an arg, to account for quoted args. See JIRA for discussion. ## How was this patch tested? Jenkins tests Author: Sean Owen <sowen@cloudera.com> Closes #12985 from srowen/SPARK-15067.
Diffstat (limited to 'launcher/src/main/java/org/apache')
-rw-r--r--launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java b/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java
index 91586aad7b..62a22008d0 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java
@@ -325,7 +325,7 @@ class CommandBuilderUtils {
return;
}
for (String arg : cmd) {
- if (arg.startsWith("-XX:MaxPermSize=")) {
+ if (arg.contains("-XX:MaxPermSize=")) {
return;
}
}