Skip to content
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.

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

fix spark k8s bug #4895

Merged
merged 1 commit into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading