Skip to content

[SPARK-29202][DEPLOY] Driver java options are not passed to driver process in Yarn client mode #25889

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 5 commits into from
Closed

[SPARK-29202][DEPLOY] Driver java options are not passed to driver process in Yarn client mode #25889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4ef428
driver java options are not passed to driver process in Yarn client mode
sandeep-katta Sep 22, 2019
32760a7
added test case
sandeep-katta Sep 23, 2019
ac8c36d
update review comments
sandeep-katta Sep 24, 2019
7b2497a
review comments fix
sandeep-katta Sep 24, 2019
6f1ba43
changed the condition to 1 liner
sandeep-katta Sep 26, 2019
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
4 changes: 1 addition & 3 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 @@ -390,9 +390,7 @@ boolean isClientMode(Map<String, String> userProps) {
String userMaster = firstNonEmpty(master, userProps.get(SparkLauncher.SPARK_MASTER));
String userDeployMode = firstNonEmpty(deployMode, userProps.get(SparkLauncher.DEPLOY_MODE));
// Default master is "local[*]", so assume client mode in that case
return userMaster == null ||
"client".equals(userDeployMode) ||
(!userMaster.equals("yarn") && userDeployMode == null);
return userMaster == null || userDeployMode == null || "client".equals(userDeployMode);
}

/**
Expand Down
20 changes: 20 additions & 0 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 @@ -250,6 +250,26 @@ public void testMissingAppResource() {
new SparkSubmitCommandBuilder().buildSparkSubmitArgs();
}

@Test
public void testIsClientMode() {
// Default master is "local[*]"
SparkSubmitCommandBuilder builder = newCommandBuilder(Collections.emptyList());
assertTrue("By default application run in local mode",
builder.isClientMode(Collections.emptyMap()));
// --master yarn or it can be any RM
List<String> sparkSubmitArgs = Arrays.asList(parser.MASTER, "yarn");
builder = newCommandBuilder(sparkSubmitArgs);
assertTrue("By default deploy mode is client", builder.isClientMode(Collections.emptyMap()));
// --master yarn and set spark.submit.deployMode to client
Map<String, String> userProps = new HashMap<>();
userProps.put("spark.submit.deployMode", "client");
assertTrue(builder.isClientMode(userProps));
// --master mesos --deploy-mode cluster
sparkSubmitArgs = Arrays.asList(parser.MASTER, "mesos", parser.DEPLOY_MODE, "cluster");
builder = newCommandBuilder(sparkSubmitArgs);
assertFalse(builder.isClientMode(Collections.emptyMap()));
}

private void testCmdBuilder(boolean isDriver, boolean useDefaultPropertyFile) throws Exception {
final String DRIVER_DEFAULT_PARAM = "-Ddriver-default";
final String DRIVER_EXTRA_PARAM = "-Ddriver-extra";
Expand Down