Skip to content

Commit 1f21f24

Browse files
committed
[Improve][SeaTunnel-Web] Change JobStatus to enum type to avoid hard coding
1 parent 0095599 commit 1f21f24

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineMetricsExtractor.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,10 @@ private JobMetrics getOrCreatePipelineMetricsMap(
401401
if (currPipelineMetrics == null) {
402402
currPipelineMetrics = new JobMetrics();
403403
metricsMap.put(pipelineId, currPipelineMetrics);
404-
currPipelineMetrics.setStatus(JobStatus.valueOf(jobPipelineStatus.get(pipelineId)));
404+
currPipelineMetrics.setStatus(
405+
"DEPLOYING".equals(jobPipelineStatus.get(pipelineId))
406+
? JobStatus.SCHEDULED
407+
: JobStatus.valueOf(jobPipelineStatus.get(pipelineId)));
405408
currPipelineMetrics.setPipelineId(pipelineId);
406409
}
407410
return currPipelineMetrics;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/utils/JobUtils.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.apache.seatunnel.app.dal.entity.JobTask;
2323
import org.apache.seatunnel.app.domain.request.job.JobExecParam;
24+
import org.apache.seatunnel.engine.core.job.JobStatus;
2425

2526
import java.util.List;
2627
import java.util.Map;
@@ -98,9 +99,9 @@ public static void updateDataSource(JobExecParam jobExecParam, List<JobTask> tas
9899
});
99100
}
100101

101-
public static boolean isJobEndStatus(String jobStatus) {
102-
return "finished".equalsIgnoreCase(jobStatus)
103-
|| "canceled".equalsIgnoreCase(jobStatus)
104-
|| "failed".equalsIgnoreCase(jobStatus);
102+
public static boolean isJobEndStatus(JobStatus jobStatus) {
103+
return JobStatus.FINISHED == jobStatus
104+
|| JobStatus.CANCELED == jobStatus
105+
|| JobStatus.FAILED == jobStatus;
105106
}
106107
}

0 commit comments

Comments
 (0)