[flink-kubernetes-operator] branch main updated: [FLINK-29819] Record an error event when savepoint fails within grace period

[gyfora]

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

gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new c406db0d [FLINK-29819] Record an error event when savepoint fails 
within grace period
c406db0d is described below

commit c406db0dae7000d8d1f75cb6d93545180f6ca173
Author: Clara Xiong <clarax98...@gmail.com>
AuthorDate: Thu Oct 27 12:53:00 2022 -0700

    [FLINK-29819] Record an error event when savepoint fails within grace period
---
 .../kubernetes/operator/observer/SavepointObserver.java   | 15 +++++++--------
 .../observer/deployment/ApplicationObserverTest.java      |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git 
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/SavepointObserver.java
 
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/SavepointObserver.java
index f0c8ee78..8fec0c82 100644
--- 
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/SavepointObserver.java
+++ 
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/SavepointObserver.java
@@ -109,17 +109,16 @@ public class SavepointObserver<
                                 + err);
                 ReconciliationUtils.updateLastReconciledSavepointTriggerNonce(
                         savepointInfo, resource);
-                eventRecorder.triggerEvent(
-                        resource,
-                        EventRecorder.Type.Warning,
-                        EventRecorder.Reason.SavepointError,
-                        EventRecorder.Component.Operator,
-                        SavepointUtils.createSavepointError(
-                                savepointInfo,
-                                
resource.getSpec().getJob().getSavepointTriggerNonce()));
             } else {
                 LOG.warn("Savepoint failed within grace period, retrying: " + 
err);
             }
+            eventRecorder.triggerEvent(
+                    resource,
+                    EventRecorder.Type.Warning,
+                    EventRecorder.Reason.SavepointError,
+                    EventRecorder.Component.Operator,
+                    SavepointUtils.createSavepointError(
+                            savepointInfo, 
resource.getSpec().getJob().getSavepointTriggerNonce()));
             savepointInfo.resetTrigger();
             return;
         }
diff --git 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
index cb472799..18587986 100644
--- 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
+++ 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
@@ -262,7 +262,7 @@ public class ApplicationObserverTest {
         observer.observe(deployment, readyContext);
         
assertFalse(SavepointUtils.savepointInProgress(deployment.getStatus().getJobStatus()));
         assertEquals(
-                0,
+                1,
                 kubernetesClient
                         .v1()
                         .events()
@@ -298,7 +298,7 @@ public class ApplicationObserverTest {
                                                                 + 
timedOutNonce))
                         .count());
         assertEquals(
-                1,
+                2,
                 
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
                         .list().getItems().stream()
                         .filter(e -> e.getReason().contains("SavepointError"))