[Imporve] changeStateEvnet equals improvements (#3603)

* [Imporve] changeStateEvnet equals improvements * [Improve] trigger savepoint FE pop-window improvements --------- Co-authored-by: benjobs <[email protected]>
apache · Mar 7, 2024 · 1a75c82 · 1a75c82
1 parent a4f64c2
commit 1a75c82
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/...e/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java b/...e/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
@@ -265,15 +265,17 @@ public String getSavePointPath(Application appParam) throws Exception {
         if (!config.isEmpty()) {
           savepointPath = config.get(CheckpointingOptions.SAVEPOINT_DIRECTORY.key());
         }
-      } else {
-        // 3.2) At the yarn or k8s mode, then read the savepoint in flink-conf.yml in the bound
-        // flink
-        FlinkEnv flinkEnv = flinkEnvService.getById(application.getVersionId());
-        savepointPath =
-            flinkEnv.convertFlinkYamlAsMap().get(CheckpointingOptions.SAVEPOINT_DIRECTORY.key());
       }
     }
 
+    // 3.2) read the savepoint in flink-conf.yml in the bound
+    if (StringUtils.isBlank(savepointPath)) {
+      // flink
+      FlinkEnv flinkEnv = flinkEnvService.getById(application.getVersionId());
+      savepointPath =
+          flinkEnv.convertFlinkYamlAsMap().get(CheckpointingOptions.SAVEPOINT_DIRECTORY.key());
+    }
+
     return savepointPath;
   }
 

diff --git a/...le-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java b/...le-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java
@@ -845,12 +845,10 @@ public boolean equals(Object object) {
         return false;
       }
       StateChangeEvent that = (StateChangeEvent) object;
-      if (optionState != that.optionState) {
-        return false;
-      }
       return Objects.equals(id, that.id)
           && Objects.equals(jobId, that.jobId)
-          && appState == that.appState
+          && Objects.equals(appState, that.appState)
+          && Objects.equals(optionState, that.optionState)
           && Objects.equals(jobManagerUrl, that.jobManagerUrl);
     }
 

diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useSavepoint.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useSavepoint.tsx
@@ -106,6 +106,7 @@ export const useSavepoint = (updateOption: Fn) => {
               const { data } = await fetchCheckSavepointPath({ id: appId.value });
               if (data.data) {
                 await handleSavepointAction(savepointReq);
+                resolve(true);
               } else {
                 await createErrorSwal(data.message);
               }