Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-6641] [ha] Don't let the ClusterClient clean up HA services da…
…ta 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.
- Loading branch information
1 parent
65fdada
commit b93396c
Showing
2 changed files
with
51 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
flink-clients/src/test/java/org/apache/flink/client/program/ClusterClientTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(); | ||
} | ||
} |