[Improve] trigger savepoint bug fixed.

apache · Mar 6, 2024 · a4f64c2 · a4f64c2
1 parent 03fffda
commit a4f64c2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 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
@@ -334,7 +334,6 @@ private void handleSavepointResponseFuture(
             savepointResponse -> {
               if (savepointResponse != null && savepointResponse.savePointDir() != null) {
                 applicationLog.setSuccess(true);
-                flinkAppHttpWatcher.cleanSavepoint(application);
                 String savePointDir = savepointResponse.savePointDir();
                 log.info("Request savepoint successful, savepointDir: {}", savePointDir);
               }

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
@@ -449,6 +449,7 @@ private void doPersistMetrics(Application application, boolean stopWatch) {
     } else {
       WATCHING_APPS.put(appId, application);
     }
+
     StateChangeEvent event = PREVIOUS_STATUS.getIfPresent(appId);
     StateChangeEvent nowEvent = StateChangeEvent.of(application);
     if (!nowEvent.equals(event)) {
@@ -617,8 +618,12 @@ private void cleanOptioning(OptionState optionState, Long key) {
   }
 
   public void cleanSavepoint(Application application) {
-    SAVEPOINT_CACHE.invalidate(application.getId());
     application.setOptionState(OptionState.NONE.getValue());
+    StateChangeEvent event = PREVIOUS_STATUS.getIfPresent(application.getId());
+    if (event != null && event.getOptionState() == OptionState.SAVEPOINTING) {
+      doPersistMetrics(application, false);
+    }
+    SAVEPOINT_CACHE.invalidate(application.getId());
   }
 
   /** set current option state */
@@ -648,6 +653,13 @@ public static void addSavepoint(Long appId) {
     }
     log.info("[StreamPark][FlinkAppHttpWatcher] add app to savepoint,appId:{}", appId);
     SAVEPOINT_CACHE.put(appId, DEFAULT_FLAG_BYTE);
+
+    // update to PREVIOUS_STATUS
+    StateChangeEvent event = PREVIOUS_STATUS.getIfPresent(appId);
+    if (event != null) {
+      event.setOptionState(OptionState.SAVEPOINTING);
+      PREVIOUS_STATUS.put(appId, event);
+    }
   }
 
   public static void unWatching(Long appId) {