You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by wu...@apache.org on 2022/05/05 03:23:45 UTC
[incubator-seatunnel] branch dev updated: [Bug] [SparkStarter] when spark extraJavaOptions is null, an exception parameter will be generated, resulting in submission failure (#1793)
This is an automated email from the ASF dual-hosted git repository.
wuchunfu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new c5291cd4 [Bug] [SparkStarter] when spark extraJavaOptions is null, an exception parameter will be generated, resulting in submission failure (#1793)
c5291cd4 is described below
commit c5291cd4f6f106b3b4e46ab646ab43a2b2edd3a7
Author: chang-wd <51...@users.noreply.github.com>
AuthorDate: Thu May 5 11:23:40 2022 +0800
[Bug] [SparkStarter] when spark extraJavaOptions is null, an exception parameter will be generated, resulting in submission failure (#1793)
Co-authored-by: weidong_chang <we...@intsig.net>
---
.../main/java/org/apache/seatunnel/core/spark/SparkStarter.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/SparkStarter.java b/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/SparkStarter.java
index 7dfc2d6c..0a7cbab9 100644
--- a/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/SparkStarter.java
+++ b/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/SparkStarter.java
@@ -161,8 +161,8 @@ public class SparkStarter implements Starter {
.filter(pair -> pair.length == 2)
.forEach(pair -> System.setProperty(pair[0], pair[1]));
this.sparkConf = getSparkConf(commandArgs.getConfigFile());
- String driverJavaOpts = this.sparkConf.get("spark.driver.extraJavaOptions");
- String executorJavaOpts = this.sparkConf.get("spark.executor.extraJavaOptions");
+ String driverJavaOpts = this.sparkConf.getOrDefault("spark.driver.extraJavaOptions", "");
+ String executorJavaOpts = this.sparkConf.getOrDefault("spark.executor.extraJavaOptions", "");
if (!commandArgs.getVariables().isEmpty()) {
String properties = commandArgs.getVariables()
.stream()
@@ -170,8 +170,8 @@ public class SparkStarter implements Starter {
.collect(Collectors.joining(" "));
driverJavaOpts += " " + properties;
executorJavaOpts += " " + properties;
- this.sparkConf.put("spark.driver.extraJavaOptions", driverJavaOpts);
- this.sparkConf.put("spark.executor.extraJavaOptions", executorJavaOpts);
+ this.sparkConf.put("spark.driver.extraJavaOptions", driverJavaOpts.trim());
+ this.sparkConf.put("spark.executor.extraJavaOptions", executorJavaOpts.trim());
}
}