You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by pn...@apache.org on 2020/06/22 15:57:20 UTC

[flink] 01/02: [hotfix][config] Remove CheckpointConfig#enableUnalignedCheckpoints without parameters.

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

pnowojski pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 078fb716b1ffea7d7143bf68437b9406cb2fb56c
Author: Arvid Heise <ar...@ververica.com>
AuthorDate: Mon Jun 22 11:41:22 2020 +0200

    [hotfix][config] Remove CheckpointConfig#enableUnalignedCheckpoints without parameters.
    
    CheckpointConfig#enableUnalignedCheckpoints(boolean) makes it explicit and also is more future-proof. When unaligned checkpoints become the default, this method will be mostly useless and we would need to add a #disableUnalignedCheckpoints() for consistency.
---
 .../tests/StatefulStreamJobUpgradeTestProgram.java        |  2 +-
 .../flink/streaming/api/environment/CheckpointConfig.java | 15 ---------------
 .../test/checkpointing/UnalignedCheckpointITCase.java     |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java b/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java
index aa94578..df7321c 100644
--- a/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java
+++ b/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java
@@ -74,7 +74,7 @@ public class StatefulStreamJobUpgradeTestProgram {
 		final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
 
 		setupEnvironment(env, pt);
-		env.getCheckpointConfig().enableUnalignedCheckpoints();
+		env.getCheckpointConfig().enableUnalignedCheckpoints(true);
 
 		if (isOriginalJobVariant(pt)) {
 			executeOriginalVariant(env, pt);
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
index e3fe262..7d23a05 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
@@ -399,21 +399,6 @@ public class CheckpointConfig implements java.io.Serializable {
 	}
 
 	/**
-	 * Enables unaligned checkpoints, which greatly reduce checkpointing times under backpressure.
-	 *
-	 * <p>Unaligned checkpoints contain data stored in buffers as part of the checkpoint state, which allows
-	 * checkpoint barriers to overtake these buffers. Thus, the checkpoint duration becomes independent of the
-	 * current throughput as checkpoint barriers are effectively not embedded into the stream of data anymore.
-	 *
-	 * <p>Unaligned checkpoints can only be enabled if {@link #checkpointingMode} is
-	 * {@link CheckpointingMode#EXACTLY_ONCE}.
-	 */
-	@PublicEvolving
-	public void enableUnalignedCheckpoints() {
-		enableUnalignedCheckpoints(true);
-	}
-
-	/**
 	 * Returns whether checkpoints should be persisted externally.
 	 *
 	 * @return <code>true</code> if checkpoints should be externalized.
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
index 6211077..9102bd9 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
@@ -182,7 +182,7 @@ public class UnalignedCheckpointITCase extends TestLogger {
 		env.enableCheckpointing(100);
 		// keep in sync with FailingMapper in #createDAG
 		env.setRestartStrategy(RestartStrategies.fixedDelayRestart(5, Time.milliseconds(100)));
-		env.getCheckpointConfig().enableUnalignedCheckpoints();
+		env.getCheckpointConfig().enableUnalignedCheckpoints(true);
 		return env;
 	}