fix spark k8s bug (#4895)

apache · Sep 4, 2023 · a3e135e · a3e135e
1 parent 4169e70
commit a3e135e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.../spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java b/.../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 String getK8sConfigFile() {
   }
 
   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/...nkis/engineplugin/spark/client/deployment/KubernetesOperatorClusterDescriptorAdapter.java b/...nkis/engineplugin/spark/client/deployment/KubernetesOperatorClusterDescriptorAdapter.java
@@ -180,10 +180,12 @@ private void getKubernetesOperatorState() {
               @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