Skip to content

[SPARK-44242] Improve Max Heap not set check #41806

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

[SPARK-44242] Improve Max Heap not set check #41806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8d57ba
[SPARK-44242] Improve Max Heap not set check
ashangit Jun 30, 2023
b262ec3
[SPARK-44242] Fix lint
ashangit Jul 3, 2023
644a928
[SPARK-44242] Fix indentation
ashangit Jul 3, 2023
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
14 changes: 9 additions & 5 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 @@ -311,11 +311,15 @@ private List<String> buildSparkSubmitCommand(Map<String, String> env)
}

private void checkJavaOptions(String javaOptions) {
if (!isEmpty(javaOptions) && javaOptions.contains("Xmx")) {
String msg = String.format("Not allowed to specify max heap(Xmx) memory settings through " +
"java options (was %s). Use the corresponding --driver-memory or " +
"spark.driver.memory configuration instead.", javaOptions);
throw new IllegalArgumentException(msg);
if (!isEmpty(javaOptions)) {
for (String javaOption: CommandBuilderUtils.parseOptionString(javaOptions)) {
if (javaOption.startsWith("-Xmx")) {
String msg = String.format("Not allowed to specify max heap(Xmx) memory settings " +
"through java options (was %s). Use the corresponding --driver-memory or " +
"spark.driver.memory configuration instead.", javaOptions);
throw new IllegalArgumentException(msg);
}
}
}
}

Expand Down
30 changes: 30 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 @@ -72,6 +72,36 @@ public void testCliHelpAndNoArg() throws Exception {
cmd.contains("org.apache.spark.deploy.SparkSubmit"));
}

@Test(expected = IllegalArgumentException.class)
public void testCheckJavaOptionsThrowException() throws Exception {
Map<String, String> env = new HashMap<>();
List<String> sparkSubmitArgs = Arrays.asList(
parser.MASTER,
"local",
parser.DRIVER_CLASS_PATH,
"/driverCp",
parser.DRIVER_JAVA_OPTIONS,
"-Xmx64g -Dprop=Other -Dprop1=\"-Xmx -Xmx\" -Dprop2=\"-Xmx '-Xmx\" " +
"-Dprop3='-Xmx -Xmx' -Dprop4='-Xmx \"-Xmx'",
SparkLauncher.NO_RESOURCE);
buildCommand(sparkSubmitArgs, env);
}

@Test
public void testCheckJavaOptions() throws Exception {
Map<String, String> env = new HashMap<>();
List<String> sparkSubmitArgs = Arrays.asList(
parser.MASTER,
"local",
parser.DRIVER_CLASS_PATH,
"/driverCp",
parser.DRIVER_JAVA_OPTIONS,
"-Dprop=-Xmx -Dprop1=\"-Xmx -Xmx\" -Dprop2=\"-Xmx '-Xmx\" " +
"-Dprop3='-Xmx -Xmx' -Dprop4='-Xmx \"-Xmx'",
SparkLauncher.NO_RESOURCE);
buildCommand(sparkSubmitArgs, env);
}

@Test
public void testCliKillAndStatus() throws Exception {
List<String> params = Arrays.asList("driver-20160531171222-0000");
Expand Down