From 6fc2740ebb59aca1aa0ee1e93658a7e4e69de33c Mon Sep 17 00:00:00 2001
From: jerryshao <sshao@hortonworks.com>
Date: Tue, 17 Nov 2015 10:01:33 -0800
Subject: [PATCH] [SPARK-11744][LAUNCHER] Fix print version throw exception
when using pyspark shell
Exception details can be seen here (https://issues.apache.org/jira/browse/SPARK-11744).
Author: jerryshao <sshao@hortonworks.com>
Closes #9721 from jerryshao/SPARK-11744.
---
.../launcher/SparkSubmitCommandBuilder.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
index 39b46e0db8..312df0b269 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
@@ -77,7 +77,7 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
}
final List<String> sparkArgs;
- private final boolean printHelp;
+ private final boolean printInfo;
/**
* Controls whether mixing spark-submit arguments with app arguments is allowed. This is needed
@@ -88,7 +88,7 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
SparkSubmitCommandBuilder() {
this.sparkArgs = new ArrayList<String>();
- this.printHelp = false;
+ this.printInfo = false;
}
SparkSubmitCommandBuilder(List<String> args) {
@@ -108,14 +108,14 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
OptionParser parser = new OptionParser();
parser.parse(submitArgs);
- this.printHelp = parser.helpRequested;
+ this.printInfo = parser.infoRequested;
}
@Override
public List<String> buildCommand(Map<String, String> env) throws IOException {
- if (PYSPARK_SHELL_RESOURCE.equals(appResource) && !printHelp) {
+ if (PYSPARK_SHELL_RESOURCE.equals(appResource) && !printInfo) {
return buildPySparkShellCommand(env);
- } else if (SPARKR_SHELL_RESOURCE.equals(appResource) && !printHelp) {
+ } else if (SPARKR_SHELL_RESOURCE.equals(appResource) && !printInfo) {
return buildSparkRCommand(env);
} else {
return buildSparkSubmitCommand(env);
@@ -311,7 +311,7 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
private class OptionParser extends SparkSubmitOptionParser {
- boolean helpRequested = false;
+ boolean infoRequested = false;
@Override
protected boolean handle(String opt, String value) {
@@ -344,7 +344,10 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
appResource = specialClasses.get(value);
}
} else if (opt.equals(HELP) || opt.equals(USAGE_ERROR)) {
- helpRequested = true;
+ infoRequested = true;
+ sparkArgs.add(opt);
+ } else if (opt.equals(VERSION)) {
+ infoRequested = true;
sparkArgs.add(opt);
} else {
sparkArgs.add(opt);
--
GitLab