[flink-kubernetes-operator] branch release-1.0 updated: [FLINK-27804] Do not observe cluster/job mid upgrade

[gyfora]

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

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


The following commit(s) were added to refs/heads/release-1.0 by this push:
     new fbaad0f  [FLINK-27804] Do not observe cluster/job mid upgrade
fbaad0f is described below

commit fbaad0f48cb5bf3a4ca2b685846dab9c072083e0
Author: Gyula Fora <g_f...@apple.com>
AuthorDate: Thu May 26 08:23:08 2022 -0700

    [FLINK-27804] Do not observe cluster/job mid upgrade
---
 .../operator/observer/deployment/AbstractDeploymentObserver.java      | 3 ++-
 .../org/apache/flink/kubernetes/operator/TestingFlinkService.java     | 3 +--
 .../kubernetes/operator/controller/FlinkDeploymentControllerTest.java | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/deployment/AbstractDeploymentObserver.java
 
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/deployment/AbstractDeploymentObserver.java
index 3411fa8..e45123c 100644
--- 
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/deployment/AbstractDeploymentObserver.java
+++ 
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/deployment/AbstractDeploymentObserver.java
@@ -79,7 +79,8 @@ public abstract class AbstractDeploymentObserver implements 
Observer<FlinkDeploy
 
         // Nothing has been launched so skip observing
         if (lastReconciledSpec == null
-                || reconciliationStatus.getState() == 
ReconciliationState.ROLLING_BACK) {
+                || reconciliationStatus.getState() == 
ReconciliationState.ROLLING_BACK
+                || reconciliationStatus.getState() == 
ReconciliationState.UPGRADING) {
             return;
         }
 
diff --git 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestingFlinkService.java
 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestingFlinkService.java
index 2540cf9..2659655 100644
--- 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestingFlinkService.java
+++ 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/TestingFlinkService.java
@@ -35,7 +35,6 @@ import 
org.apache.flink.kubernetes.operator.crd.spec.UpgradeMode;
 import org.apache.flink.kubernetes.operator.crd.status.FlinkDeploymentStatus;
 import 
org.apache.flink.kubernetes.operator.crd.status.JobManagerDeploymentStatus;
 import org.apache.flink.kubernetes.operator.crd.status.Savepoint;
-import 
org.apache.flink.kubernetes.operator.exception.DeploymentFailedException;
 import org.apache.flink.kubernetes.operator.observer.SavepointFetchResult;
 import org.apache.flink.kubernetes.operator.service.FlinkService;
 import org.apache.flink.kubernetes.operator.utils.FlinkUtils;
@@ -128,7 +127,7 @@ public class TestingFlinkService extends FlinkService {
             validateHaMetadataExists(conf);
         }
         if (deployFailure) {
-            throw new DeploymentFailedException("Deployment failure", "test");
+            throw new Exception("Deployment failure");
         }
         if (!jobs.isEmpty()) {
             throw new Exception("Cannot submit 2 application clusters at the 
same time");
diff --git 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
index 5c4590a..98c4337 100644
--- 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
+++ 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
@@ -327,10 +327,6 @@ public class FlinkDeploymentControllerTest {
                         .getSavepointHistory()
                         .size());
 
-        flinkService.setDeployFailure(true);
-        assertNotEquals(0, testController.reconcile(appCluster, 
context).getScheduleDelay().get());
-
-        flinkService.setDeployFailure(false);
         testController.reconcile(appCluster, context);
         jobs = flinkService.listJobs();
         assertEquals(1, jobs.size());