Skip to content

[MINOR] Avoid passing the PermGenSize option to IBM JVMs. #6055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[MINOR] Avoid passing the PermGenSize option to IBM JVMs. #6055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42a8c3f
[MINOR] Avoid passing the PermGenSize option to IBM JVMs.
tellison May 11, 2015
d27174b
Merge branch 'master' of https://github.com/apache/spark into MaxPerm…
tellison May 12, 2015
6ad4266
Remove unnecessary else clauses to reduce nesting.
tellison May 13, 2015
3a0fb66
Convert tabs back to spaces
tellison May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ List<String> buildJavaCommand(String extraClassPath) throws IOException {
* set it.
*/
void addPermGenSizeOpt(List<String> cmd) {
// Don't set MaxPermSize for Java 8 and later.
// Don't set MaxPermSize for IBM Java, or Oracle Java 8 and later.
if (getJavaVendor() == JavaVendor.IBM) {
return;
}
String[] version = System.getProperty("java.version").split("\\.");
if (Integer.parseInt(version[0]) > 1 || Integer.parseInt(version[1]) > 7) {
return;
Expand Down
20 changes: 20 additions & 0 deletions launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ class CommandBuilderUtils {
static final String ENV_SPARK_HOME = "SPARK_HOME";
static final String ENV_SPARK_ASSEMBLY = "_SPARK_ASSEMBLY";

/** The set of known JVM vendors. */
static enum JavaVendor {
Oracle, IBM, OpenJDK, Unknown
};

/** Returns whether the given string is null or empty. */
static boolean isEmpty(String s) {
return s == null || s.isEmpty();
Expand Down Expand Up @@ -108,6 +113,21 @@ static boolean isWindows() {
return os.startsWith("Windows");
}

/** Returns an enum value indicating whose JVM is being used. */
static JavaVendor getJavaVendor() {
String vendorString = System.getProperty("java.vendor");
if (vendorString.contains("Oracle")) {
return JavaVendor.Oracle;
}
if (vendorString.contains("IBM")) {
return JavaVendor.IBM;
}
if (vendorString.contains("OpenJDK")) {
return JavaVendor.OpenJDK;
}
return JavaVendor.Unknown;
}

/**
* Updates the user environment, appending the given pathList to the existing value of the given
* environment variable (or setting it if it hasn't yet been set).
Expand Down