tillrohrmann commented on a change in pull request #14847:
URL: https://github.com/apache/flink/pull/14847#discussion_r583483669
##########
File path:
flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/SchedulerBase.java
##########
@@ -883,10 +887,26 @@ public void updateAccumulators(final AccumulatorSnapshot
accumulatorSnapshot) {
mainThreadExecutor);
}
- private void startCheckpointScheduler(final CheckpointCoordinator
checkpointCoordinator) {
+ @Override
+ public void stopCheckpointScheduler() {
+ final CheckpointCoordinator checkpointCoordinator =
getCheckpointCoordinator();
+ if (checkpointCoordinator == null) {
+ log.info(
+ "Periodic checkpoint scheduling could not be stopped due
to the CheckpointCoordinator being shutdown.");
+ } else {
+ getCheckpointCoordinator().stopCheckpointScheduler();
Review comment:
```suggestion
checkpointCoordinator.stopCheckpointScheduler();
```
##########
File path:
flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/stopwithsavepoint/StopWithSavepointTerminationHandlerImplTest.java
##########
@@ -0,0 +1,226 @@
+/*
+ * 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.runtime.scheduler.stopwithsavepoint;
+
+import org.apache.flink.api.common.JobID;
+import org.apache.flink.core.testutils.FlinkMatchers;
+import org.apache.flink.runtime.checkpoint.CheckpointProperties;
+import org.apache.flink.runtime.checkpoint.CompletedCheckpoint;
+import org.apache.flink.runtime.checkpoint.TestingCheckpointScheduling;
+import org.apache.flink.runtime.execution.ExecutionState;
+import org.apache.flink.runtime.scheduler.SchedulerNG;
+import org.apache.flink.runtime.scheduler.TestingSchedulerNG;
+import org.apache.flink.runtime.state.StreamStateHandle;
+import org.apache.flink.runtime.state.testutils.EmptyStreamStateHandle;
+import
org.apache.flink.runtime.state.testutils.TestCompletedCheckpointStorageLocation;
+import org.apache.flink.util.ExceptionUtils;
+import org.apache.flink.util.FlinkException;
+import org.apache.flink.util.TestLogger;
+
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * {@code StopWithSavepointTerminationHandlerImplTest} tests {@link
+ * StopWithSavepointTerminationHandlerImpl}.
+ */
+public class StopWithSavepointTerminationHandlerImplTest extends TestLogger {
+
+ private static final JobID JOB_ID = new JobID();
+
+ private final TestingCheckpointScheduling checkpointScheduling =
+ new TestingCheckpointScheduling(false);
+
+ private StopWithSavepointTerminationHandlerImpl
createTestInstanceFailingOnGlobalFailOver() {
+ return createTestInstance(
+ throwableCausingGlobalFailOver -> fail("No global failover
should be triggered."));
+ }
+
+ private StopWithSavepointTerminationHandlerImpl createTestInstance(
+ Consumer<Throwable> handleGlobalFailureConsumer) {
+ // checkpointing should be always stopped before initiating
stop-with-savepoint
+ checkpointScheduling.stopCheckpointScheduler();
+
+ final SchedulerNG scheduler =
+ TestingSchedulerNG.newBuilder()
+
.setHandleGlobalFailureConsumer(handleGlobalFailureConsumer)
+ .build();
+ return new StopWithSavepointTerminationHandlerImpl(
+ JOB_ID, scheduler, checkpointScheduling, log);
+ }
+
+ @Test
+ public void testHappyPath() throws ExecutionException,
InterruptedException {
+ final StopWithSavepointTerminationHandlerImpl testInstance =
+ createTestInstanceFailingOnGlobalFailOver();
+
+ final EmptyStreamStateHandle streamStateHandle = new
EmptyStreamStateHandle();
+ final CompletedCheckpoint completedSavepoint =
createCompletedSavepoint(streamStateHandle);
+ testInstance.handleSavepointCreation(completedSavepoint, null);
+
testInstance.handleExecutionsTermination(Collections.singleton(ExecutionState.FINISHED));
+
+ assertThat(
+ testInstance.getSavepointPath().get(),
is(completedSavepoint.getExternalPointer()));
+
+ assertFalse(
+ "The savepoint should not have been discarded.",
streamStateHandle.isDisposed());
+ assertFalse("Checkpoint scheduling should be disabled.",
checkpointScheduling.isEnabled());
+ }
+
+ @Test
+ public void testSavepointCreationFailureWithoutExecutionTermination() {
+ // savepoint creation failure is handled as expected if no execution
termination happens
+ assertSavepointCreationFailure(testInstance -> {});
+ }
+
+ @Test
+ public void testSavepointCreationFailureWithFailingExecutions() {
+ // no global fail-over is expected to be triggered by the
stop-with-savepoint despite the
+ // execution failure
+ assertSavepointCreationFailure(
+ testInstance ->
+ testInstance.handleExecutionsTermination(
+
Collections.singletonList(ExecutionState.FAILED)));
+ }
+
+ @Test
+ public void testSavepointCreationFailureWithFinishingExecutions() {
+ // checkpoint scheduling should be still enabled despite the finished
executions
+ assertSavepointCreationFailure(
+ testInstance ->
+ testInstance.handleExecutionsTermination(
+
Collections.singletonList(ExecutionState.FINISHED)));
+ }
+
+ public void assertSavepointCreationFailure(
+ Consumer<StopWithSavepointTerminationHandler>
handleExecutionsTermination) {
+ final StopWithSavepointTerminationHandlerImpl testInstance =
+ createTestInstanceFailingOnGlobalFailOver();
+
+ final String expectedErrorMessage = "Expected exception during
savepoint creation.";
+ testInstance.handleSavepointCreation(null, new
Exception(expectedErrorMessage));
+ handleExecutionsTermination.accept(testInstance);
+
+ try {
+ testInstance.getSavepointPath().get();
+ fail("An ExecutionException is expected.");
+ } catch (Throwable e) {
+ final Optional<Throwable> actualException =
+ ExceptionUtils.findThrowableWithMessage(e,
expectedErrorMessage);
+ assertTrue(
+ "An exception with the expected error message should have
been thrown.",
+ actualException.isPresent());
+ }
+
+ // the checkpoint scheduling should be enabled in case of failure
+ assertTrue("Checkpoint scheduling should be enabled.",
checkpointScheduling.isEnabled());
+ }
+
+ @Test
+ public void testFailedTerminationHandling() throws ExecutionException,
InterruptedException {
+ final CompletableFuture<Throwable> globalFailOverTriggered = new
CompletableFuture<>();
+ final StopWithSavepointTerminationHandlerImpl testInstance =
+ createTestInstance(globalFailOverTriggered::complete);
+
+ final ExecutionState expectedNonFinishedState = ExecutionState.FAILED;
+ final String expectedErrorMessage =
+ String.format(
+ "Inconsistent execution state after stopping with
savepoint. At least one execution is still in one of the following states: %s.
A global fail-over is triggered to recover the job %s.",
+ expectedNonFinishedState, JOB_ID);
+
+ final EmptyStreamStateHandle streamStateHandle = new
EmptyStreamStateHandle();
+ final CompletedCheckpoint completedSavepoint =
createCompletedSavepoint(streamStateHandle);
+
+ testInstance.handleSavepointCreation(completedSavepoint, null);
+ testInstance.handleExecutionsTermination(
+ Collections.singletonList(expectedNonFinishedState));
+
+ try {
+ testInstance.getSavepointPath().get();
+ fail("An ExecutionException is expected.");
+ } catch (Throwable e) {
+ final Optional<FlinkException> actualFlinkException =
+ ExceptionUtils.findThrowable(e, FlinkException.class);
+ assertTrue(
+ "A FlinkException should have been thrown.",
actualFlinkException.isPresent());
+ assertThat(
+ actualFlinkException.get(),
+ FlinkMatchers.containsMessage(expectedErrorMessage));
+ }
+
+ assertTrue("Global fail-over was not triggered.",
globalFailOverTriggered.isDone());
+ assertThat(
+ globalFailOverTriggered.get(),
FlinkMatchers.containsMessage(expectedErrorMessage));
+
+ assertFalse("Savepoint should not be discarded.",
streamStateHandle.isDisposed());
+
+ // the checkpoint scheduling should be enabled in case of failure
Review comment:
```suggestion
// the checkpoint scheduling should not be enabled in case of failure
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
