This is an automated email from the ASF dual-hosted git repository. yao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new 299a6597950b [SPARK-47614][CORE][DOC] Update some outdated comments about `JavaModuleOptions` 299a6597950b is described below commit 299a6597950b33382d2eab274b95ba8dbbef1d53 Author: panbingkun <panbing...@baidu.com> AuthorDate: Thu Mar 28 19:28:27 2024 +0800 [SPARK-47614][CORE][DOC] Update some outdated comments about `JavaModuleOptions` ### What changes were proposed in this pull request? The pr aims to update some outdated comments about `JavaModuleOptions`. ### Why are the changes needed? As more and more options for JVM runtime are added to the class `JavaModuleOptions`, some doc comments about `JavaModuleOptions` have outdated. Let's update it. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? N/A. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #45735 from panbingkun/SPARK-47614. Authored-by: panbingkun <panbing...@baidu.com> Signed-off-by: Kent Yao <y...@apache.org> --- core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +- .../main/java/org/apache/spark/launcher/JavaModuleOptions.java | 8 +++----- .../java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index f8f0107ed139..7595488cecee 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -3291,7 +3291,7 @@ object SparkContext extends Logging { } /** - * SPARK-36796: This is a helper function to supplement `--add-opens` options to + * SPARK-36796: This is a helper function to supplement some JVM runtime options to * `spark.driver.extraJavaOptions` and `spark.executor.extraJavaOptions`. */ private def supplementJavaModuleOptions(conf: SparkConf): Unit = { diff --git a/launcher/src/main/java/org/apache/spark/launcher/JavaModuleOptions.java b/launcher/src/main/java/org/apache/spark/launcher/JavaModuleOptions.java index 3a8fa6c42d47..dc5840185d62 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/JavaModuleOptions.java +++ b/launcher/src/main/java/org/apache/spark/launcher/JavaModuleOptions.java @@ -18,7 +18,7 @@ package org.apache.spark.launcher; /** - * This helper class is used to place the all `--add-opens` options + * This helper class is used to place some JVM runtime options(eg: `--add-opens`) * required by Spark when using Java 17. `DEFAULT_MODULE_OPTIONS` has added * `-XX:+IgnoreUnrecognizedVMOptions` to be robust. * @@ -46,16 +46,14 @@ public class JavaModuleOptions { "-Dio.netty.tryReflectionSetAccessible=true"}; /** - * Returns the default Java options related to `--add-opens' and - * `-XX:+IgnoreUnrecognizedVMOptions` used by Spark. + * Returns the default JVM runtime options used by Spark. */ public static String defaultModuleOptions() { return String.join(" ", DEFAULT_MODULE_OPTIONS); } /** - * Returns the default Java option array related to `--add-opens' and - * `-XX:+IgnoreUnrecognizedVMOptions` used by Spark. + * Returns the default JVM runtime option array used by Spark. */ public static String[] defaultModuleOptionArray() { return DEFAULT_MODULE_OPTIONS; 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 d884f7e474c0..9b53711ebaea 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java @@ -309,7 +309,7 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder { config.get(SparkLauncher.DRIVER_EXTRA_LIBRARY_PATH)); } - // SPARK-36796: Always add default `--add-opens` to submit command + // SPARK-36796: Always add some JVM runtime default options to submit command addOptionString(cmd, JavaModuleOptions.defaultModuleOptions()); addOptionString(cmd, "-Dderby.connection.requireAuthentication=false"); cmd.add("org.apache.spark.deploy.SparkSubmit"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org