This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new a3e135ea1 fix spark k8s bug (#4895)
a3e135ea1 is described below
commit a3e135ea1cace9b635dadaae03342984c5a28960
Author: ChengJie1053 <[email protected]>
AuthorDate: Mon Sep 4 16:24:39 2023 +0800
fix spark k8s bug (#4895)
---
.../linkis/engineplugin/spark/client/context/SparkConfig.java | 6 ++++++
.../deployment/KubernetesOperatorClusterDescriptorAdapter.java | 10 ++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git
a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java
b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java
index 24d3ddcb2..3d0fc0ff3 100644
---
a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java
+++
b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java
@@ -17,6 +17,8 @@
package org.apache.linkis.engineplugin.spark.client.context;
+import org.apache.commons.lang3.StringUtils;
+
import java.util.HashMap;
import java.util.Map;
@@ -131,6 +133,10 @@ public class SparkConfig {
}
public void setK8sConfigFile(String k8sConfigFile) {
+ if (StringUtils.isNotBlank(k8sConfigFile) &&
k8sConfigFile.startsWith("~")) {
+ String user = System.getProperty("user.home");
+ k8sConfigFile = k8sConfigFile.replaceFirst("~", user);
+ }
this.k8sConfigFile = k8sConfigFile;
}
diff --git
a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/KubernetesOperatorClusterDescriptorAdapter.java
b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/KubernetesOperatorClusterDescriptorAdapter.java
index 3ea27b394..eafa8abec 100644
---
a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/KubernetesOperatorClusterDescriptorAdapter.java
+++
b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/KubernetesOperatorClusterDescriptorAdapter.java
@@ -180,10 +180,12 @@ public class KubernetesOperatorClusterDescriptorAdapter
extends ClusterDescripto
@Override
public void eventReceived(Action action, SparkApplication
sparkApplication) {
// todo get status
- applicationId =
sparkApplication.getStatus().getSparkApplicationId();
- jobState =
- kubernetesOperatorStateConvertSparkState(
-
sparkApplication.getStatus().getApplicationState().getState());
+ if (Objects.nonNull(sparkApplication.getStatus())) {
+ applicationId =
sparkApplication.getStatus().getSparkApplicationId();
+ jobState =
+ kubernetesOperatorStateConvertSparkState(
+
sparkApplication.getStatus().getApplicationState().getState());
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
