Skip to content

[SPARK-32804][Launcher][FOLLOWUP] Fix SparkSubmitCommandBuilderSuite test failure without jars #29769

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
KevinSmile wants to merge 1 commit into from
Closed

[SPARK-32804][Launcher][FOLLOWUP] Fix SparkSubmitCommandBuilderSuite test failure without jars #29769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 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 @@ -404,12 +404,17 @@ private boolean isThriftServer(String mainClass) {
}

private String findExamplesAppJar() {
for (String exampleJar : findExamplesJars()) {
if (new File(exampleJar).getName().startsWith("spark-examples")) {
return exampleJar;
boolean isTesting = "1".equals(getenv("SPARK_TESTING"));
if (isTesting) {
return SparkLauncher.NO_RESOURCE;
} else {
for (String exampleJar : findExamplesJars()) {
if (new File(exampleJar).getName().startsWith("spark-examples")) {
return exampleJar;
}
}
throw new IllegalStateException("Failed to find examples' main app jar.");
}
throw new IllegalStateException("Failed to find examples' main app jar.");
}

private List<String> findExamplesJars() {
Expand Down
4 changes: 2 additions & 2 deletions launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ public void testExamplesRunnerPrimaryResource() throws Exception {
findArgValue(cmd, parser.CLASS));
assertEquals("cluster", findArgValue(cmd, parser.DEPLOY_MODE));
String primaryResource = cmd.get(cmd.size() - 2);
assertTrue(new File(primaryResource).getName().startsWith("spark-examples"));
assertFalse(cmd.contains(SparkLauncher.NO_RESOURCE));
assertTrue(primaryResource.equals(SparkLauncher.NO_RESOURCE)
|| new File(primaryResource).getName().startsWith("spark-examples"));
}

@Test(expected = IllegalArgumentException.class)
Expand Down