(amoro) branch master updated: [AMORO-3172] AMS ProcessStatus Miss Running Status (#3173)

[jinsongzhou]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ed816260 [AMORO-3172] AMS ProcessStatus Miss Running Status (#3173)
6ed816260 is described below

commit 6ed81626026ee6ff2fd5c02fe087225aecd80066
Author: ConradJam <jam.gz...@gmail.com>
AuthorDate: Thu Oct 10 11:59:52 2024 +0800

    [AMORO-3172] AMS ProcessStatus Miss Running Status (#3173)
    
    * [AMORO-3172] AMS ProcessStatus Miss Running Status
    
    * fix comment
    
    ---------
    
    Co-authored-by: ConradJam <czy...@apache.com>
---
 .../src/main/java/org/apache/amoro/process/ProcessStatus.java  | 10 +++-------
 .../src/main/java/org/apache/amoro/process/TableProcess.java   |  2 +-
 .../main/java/org/apache/amoro/process/TableProcessState.java  |  4 ++--
 .../org/apache/amoro/formats/hudi/HudiTableDescriptor.java     |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/amoro-common/src/main/java/org/apache/amoro/process/ProcessStatus.java 
b/amoro-common/src/main/java/org/apache/amoro/process/ProcessStatus.java
index c89cbc25e..77d2ae023 100644
--- a/amoro-common/src/main/java/org/apache/amoro/process/ProcessStatus.java
+++ b/amoro-common/src/main/java/org/apache/amoro/process/ProcessStatus.java
@@ -18,16 +18,12 @@
 
 package org.apache.amoro.process;
 
-/**
- * Status of any {@link AmoroProcess}. Only UNKNOWN, RUNNING, 
FINISHED(SUCCESS, CLOSED, FAILED) are
- * necessary Stage classes are used to define multiple phases of one process 
such as OptimizingStage
- */
+/** Status of any {@link AmoroProcess}. */
 public enum ProcessStatus {
   UNKNOWN,
   PENDING,
-
-  /** This status containing scheduled and running phases */
-  ACTIVE,
+  RUNNING,
+  SUBMITTED,
   SUCCESS,
   CLOSED,
   FAILED
diff --git 
a/amoro-common/src/main/java/org/apache/amoro/process/TableProcess.java 
b/amoro-common/src/main/java/org/apache/amoro/process/TableProcess.java
index a3b6be1e0..2df63b7fc 100644
--- a/amoro-common/src/main/java/org/apache/amoro/process/TableProcess.java
+++ b/amoro-common/src/main/java/org/apache/amoro/process/TableProcess.java
@@ -31,7 +31,7 @@ public abstract class TableProcess<T extends 
TableProcessState> implements Amoro
   protected final TableRuntime tableRuntime;
   private final SimpleFuture submitFuture = new SimpleFuture();
   private final SimpleFuture completeFuture = new SimpleFuture();
-  private volatile ProcessStatus status = ProcessStatus.ACTIVE;
+  private volatile ProcessStatus status = ProcessStatus.RUNNING;
   private volatile String failedReason;
 
   protected TableProcess(T state, TableRuntime tableRuntime) {
diff --git 
a/amoro-common/src/main/java/org/apache/amoro/process/TableProcessState.java 
b/amoro-common/src/main/java/org/apache/amoro/process/TableProcessState.java
index c358e64af..024484ddc 100644
--- a/amoro-common/src/main/java/org/apache/amoro/process/TableProcessState.java
+++ b/amoro-common/src/main/java/org/apache/amoro/process/TableProcessState.java
@@ -32,7 +32,7 @@ public class TableProcessState implements ProcessState {
   private final ServerTableIdentifier tableIdentifier;
   @StateField private long startTime;
   @StateField private long endTime = -1L;
-  @StateField private ProcessStatus status = ProcessStatus.ACTIVE;
+  @StateField private ProcessStatus status = ProcessStatus.SUBMITTED;
   @StateField private volatile String failedReason;
   private volatile Map<String, String> summary;
 
@@ -108,7 +108,7 @@ public class TableProcessState implements ProcessState {
         || status == ProcessStatus.FAILED
         || status == ProcessStatus.CLOSED) {
       endTime = System.currentTimeMillis();
-    } else if (this.status != ProcessStatus.ACTIVE && status == 
ProcessStatus.ACTIVE) {
+    } else if (this.status != ProcessStatus.SUBMITTED && status == 
ProcessStatus.SUBMITTED) {
       endTime = -1L;
       failedReason = null;
       summary = null;
diff --git 
a/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java
 
b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java
index a70dd0ab4..8720958b0 100644
--- 
a/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java
+++ 
b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java
@@ -447,7 +447,7 @@ public class HudiTableDescriptor implements 
FormatTableDescriptor {
       HoodieInstant inf =
           instantMap.get(instantTimestamp + "_" + 
HoodieInstant.State.INFLIGHT.name());
       if (inf != null) {
-        processInfo.setStatus(ProcessStatus.ACTIVE);
+        processInfo.setStatus(ProcessStatus.RUNNING);
       }
     }
     return processInfo;