You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by wa...@apache.org on 2022/04/20 07:18:06 UTC
[flink-kubernetes-operator] branch main updated: [FLINK-27289] Avoid calling waitForClusterShutdown twice when stopping session cluster with deleting HA data
This is an automated email from the ASF dual-hosted git repository.
wangyang0918 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 dc1cca8 [FLINK-27289] Avoid calling waitForClusterShutdown twice when stopping session cluster with deleting HA data
dc1cca8 is described below
commit dc1cca82c31feb97ea960a919b90d711f2a1de92
Author: lz <97...@qq.com>
AuthorDate: Mon Apr 18 18:11:30 2022 +0800
[FLINK-27289] Avoid calling waitForClusterShutdown twice when stopping session cluster with deleting HA data
This closes #171.
---
.../kubernetes/operator/reconciler/deployment/SessionReconciler.java | 4 ++++
.../org/apache/flink/kubernetes/operator/service/FlinkService.java | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/reconciler/deployment/SessionReconciler.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/reconciler/deployment/SessionReconciler.java
index b904a74..4f83bc7 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/reconciler/deployment/SessionReconciler.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/reconciler/deployment/SessionReconciler.java
@@ -94,6 +94,10 @@ public class SessionReconciler extends AbstractDeploymentReconciler {
effectiveConfig,
false,
operatorConfiguration.getFlinkShutdownClusterTimeout().toSeconds());
+ FlinkUtils.waitForClusterShutdown(
+ kubernetesClient,
+ effectiveConfig,
+ operatorConfiguration.getFlinkShutdownClusterTimeout().toSeconds());
flinkService.submitSessionCluster(effectiveConfig);
status.setJobManagerDeploymentStatus(JobManagerDeploymentStatus.DEPLOYING);
IngressUtils.updateIngressRules(objectMeta, deploySpec, effectiveConfig, kubernetesClient);
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkService.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkService.java
index dfd5084..48bf185 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkService.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkService.java
@@ -404,7 +404,6 @@ public class FlinkService {
public void stopSessionCluster(
ObjectMeta objectMeta, Configuration conf, boolean deleteHaData, long shutdownTimeout) {
FlinkUtils.deleteCluster(objectMeta, kubernetesClient, deleteHaData, shutdownTimeout);
- FlinkUtils.waitForClusterShutdown(kubernetesClient, conf, shutdownTimeout);
}
public void triggerSavepoint(