Skip to content

[SPARK-11744][Launcher] Fix print version throw exception when using pyspark shell #9721

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
jerryshao wants to merge 2 commits into from
Closed

[SPARK-11744][Launcher] Fix print version throw exception when using pyspark shell #9721

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f90c60
Fix print version exception on python shell
jerryshao Nov 15, 2015
0534833
Remove unnessary variable
jerryshao Nov 17, 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
Next Next commit
Fix print version exception on python shell
  • Loading branch information
@jerryshao
jerryshao committed Nov 15, 2015
commit 7f90c60c7930d0802eb7465ed34a94f0b71b890f
11 changes: 9 additions & 2 deletions launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {

final List<String> sparkArgs;
private final boolean printHelp;
private final boolean printVersion;

/**
* Controls whether mixing spark-submit arguments with app arguments is allowed. This is needed
Expand All @@ -89,6 +90,7 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
SparkSubmitCommandBuilder() {
this.sparkArgs = new ArrayList<String>();
this.printHelp = false;
this.printVersion = false;
}

SparkSubmitCommandBuilder(List<String> args) {
Expand All @@ -109,13 +111,14 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
OptionParser parser = new OptionParser();
parser.parse(submitArgs);
this.printHelp = parser.helpRequested;
this.printVersion = parser.versionRequested;
}

@Override
public List<String> buildCommand(Map<String, String> env) throws IOException {
if (PYSPARK_SHELL_RESOURCE.equals(appResource) && !printHelp) {
if (PYSPARK_SHELL_RESOURCE.equals(appResource) && !printHelp && !printVersion) {
return buildPySparkShellCommand(env);
} else if (SPARKR_SHELL_RESOURCE.equals(appResource) && !printHelp) {
} else if (SPARKR_SHELL_RESOURCE.equals(appResource) && !printHelp && !printVersion) {
return buildSparkRCommand(env);
} else {
return buildSparkSubmitCommand(env);
Expand Down Expand Up @@ -312,6 +315,7 @@ private boolean isThriftServer(String mainClass) {
private class OptionParser extends SparkSubmitOptionParser {

boolean helpRequested = false;
boolean versionRequested = false;

@Override
protected boolean handle(String opt, String value) {
Expand Down Expand Up @@ -346,6 +350,9 @@ protected boolean handle(String opt, String value) {
} else if (opt.equals(HELP) || opt.equals(USAGE_ERROR)) {
helpRequested = true;
sparkArgs.add(opt);
} else if (opt.equals(VERSION)) {
versionRequested = true;
sparkArgs.add(opt);
} else {
sparkArgs.add(opt);
if (value != null) {
Expand Down