flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject flink git commit: [FLINK-6641] [ha] Don't let the ClusterClient clean up HA services data when being shut down
Date Sat, 20 May 2017 12:56:36 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.3 5fde739fd -> c15f37397


[FLINK-6641] [ha] Don't let the ClusterClient clean up HA services data when being shut down

The ClusterClient should not call HighAvailabilityServices#closeAndCleanupAllData when being
shut down.
The reason is that this call will delete all HA data needed for a future recovery. Only the
JobManager
should be allowed to decide when to discard HA data or not.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c15f3739
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c15f3739
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c15f3739

Branch: refs/heads/release-1.3
Commit: c15f37397822d8df0ebcbea30f94c669374432b7
Parents: 5fde739
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Fri May 19 17:24:21 2017 +0200
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Sat May 20 14:56:19 2017 +0200

----------------------------------------------------------------------
 .../flink/client/program/ClusterClient.java     |  2 +-
 .../flink/client/program/ClusterClientTest.java | 50 ++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/c15f3739/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
index 6770eee..b081721 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
@@ -233,7 +233,7 @@ public abstract class ClusterClient {
 			}
 
 			if (highAvailabilityServices != null) {
-				highAvailabilityServices.closeAndCleanupAllData();
+				highAvailabilityServices.close();
 			}
 		}
 	}

http://git-wip-us.apache.org/repos/asf/flink/blob/c15f3739/flink-clients/src/test/java/org/apache/flink/client/program/ClusterClientTest.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/ClusterClientTest.java
b/flink-clients/src/test/java/org/apache/flink/client/program/ClusterClientTest.java
new file mode 100644
index 0000000..3879fa3
--- /dev/null
+++ b/flink-clients/src/test/java/org/apache/flink/client/program/ClusterClientTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.client.program;
+
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
+import org.apache.flink.util.TestLogger;
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+public class ClusterClientTest extends TestLogger {
+
+	/**
+	 * FLINK-6641
+	 *
+	 * Tests that the {@link ClusterClient} does not clean up HA data when being shut down.
+	 */
+	@Test
+	public void testClusterClientShutdown() throws Exception {
+		Configuration config = new Configuration();
+		HighAvailabilityServices highAvailabilityServices = mock(HighAvailabilityServices.class);
+
+		ClusterClient clusterClient = new StandaloneClusterClient(config, highAvailabilityServices);
+
+		clusterClient.shutdown();
+
+		// check that the client does not clean up HA data but closes the services
+		verify(highAvailabilityServices, never()).closeAndCleanupAllData();
+		verify(highAvailabilityServices).close();
+	}
+}


Mime
View raw message