You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fa...@apache.org on 2023/04/25 02:22:04 UTC
[flink] branch release-1.17 updated: [FLINK-31588][checkpoint] Correct the unaligned checkpoint type based on the bytesPersistedDuringAlignment
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch release-1.17
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.17 by this push:
new a3c00eed371 [FLINK-31588][checkpoint] Correct the unaligned checkpoint type based on the bytesPersistedDuringAlignment
a3c00eed371 is described below
commit a3c00eed371f8a2c9bfe557fa07dc7bc8a04f14e
Author: 1996fanrui <19...@gmail.com>
AuthorDate: Fri Apr 21 18:02:07 2023 +0800
[FLINK-31588][checkpoint] Correct the unaligned checkpoint type based on the bytesPersistedDuringAlignment
---
.../checkpoint/CheckpointMetricsBuilder.java | 10 +---
.../runtime/checkpoint/CheckpointMetricsTest.java | 58 ++++++++++++++++++++++
.../tasks/SubtaskCheckpointCoordinatorImpl.java | 1 -
3 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointMetricsBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointMetricsBuilder.java
index 73d8ef1eb92..20fca6d9276 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointMetricsBuilder.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointMetricsBuilder.java
@@ -40,7 +40,6 @@ public class CheckpointMetricsBuilder {
private long syncDurationMillis = -1L;
private long asyncDurationMillis = -1L;
private long checkpointStartDelayNanos = -1L;
- private boolean unalignedCheckpoint = false;
private long totalBytesPersisted = -1L;
private long bytesPersistedOfThisCheckpoint = -1L;
@@ -119,11 +118,6 @@ public class CheckpointMetricsBuilder {
return checkpointStartDelayNanos;
}
- public CheckpointMetricsBuilder setUnalignedCheckpoint(boolean unalignedCheckpoint) {
- this.unalignedCheckpoint = unalignedCheckpoint;
- return this;
- }
-
public CheckpointMetricsBuilder setTotalBytesPersisted(long totalBytesPersisted) {
this.totalBytesPersisted = totalBytesPersisted;
return this;
@@ -147,7 +141,7 @@ public class CheckpointMetricsBuilder {
syncDurationMillis,
asyncDurationMillis,
checkpointStartDelayNanos,
- unalignedCheckpoint,
+ bytesPersistedDuringAlignment > 0,
bytesPersistedOfThisCheckpoint,
totalBytesPersisted);
}
@@ -160,7 +154,7 @@ public class CheckpointMetricsBuilder {
syncDurationMillis,
asyncDurationMillis,
checkpointStartDelayNanos,
- unalignedCheckpoint,
+ bytesPersistedDuringAlignment > 0,
bytesPersistedOfThisCheckpoint,
totalBytesPersisted);
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointMetricsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointMetricsTest.java
new file mode 100644
index 00000000000..9021272b687
--- /dev/null
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointMetricsTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.checkpoint;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for the {@link CheckpointMetrics} class. */
+public class CheckpointMetricsTest {
+
+ @Test
+ public void testUnalignedCheckpointType() throws Exception {
+ CheckpointMetricsBuilder metricsBuilder = new CheckpointMetricsBuilder();
+ metricsBuilder.setBytesProcessedDuringAlignment(0L);
+ metricsBuilder.setAlignmentDurationNanos(0L);
+ metricsBuilder.setBytesPersistedOfThisCheckpoint(0L);
+ metricsBuilder.setTotalBytesPersisted(0L);
+
+ // The checkpoint shouldn't be unaligned checkpoint when builder doesn't set
+ // bytesPersistedDuringAlignment
+ assertThat(metricsBuilder.build().getUnalignedCheckpoint()).isFalse();
+ assertThat(metricsBuilder.buildIncomplete().getUnalignedCheckpoint()).isFalse();
+
+ assertUnalignedCheckpointType(metricsBuilder, 0L);
+ assertUnalignedCheckpointType(metricsBuilder, 1L);
+ assertUnalignedCheckpointType(metricsBuilder, 5L);
+ assertUnalignedCheckpointType(metricsBuilder, 10L);
+ assertUnalignedCheckpointType(metricsBuilder, 100L);
+ }
+
+ private void assertUnalignedCheckpointType(
+ CheckpointMetricsBuilder metricsBuilder, long bytesPersistedDuringAlignment) {
+ boolean expectedUnalignedCheckpointType = bytesPersistedDuringAlignment > 0;
+ metricsBuilder.setBytesPersistedDuringAlignment(bytesPersistedDuringAlignment);
+
+ assertThat(metricsBuilder.build().getUnalignedCheckpoint())
+ .isEqualTo(expectedUnalignedCheckpointType);
+ assertThat(metricsBuilder.buildIncomplete().getUnalignedCheckpoint())
+ .isEqualTo(expectedUnalignedCheckpointType);
+ }
+}
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java
index c12541b7f6d..b621181287d 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java
@@ -733,7 +733,6 @@ class SubtaskCheckpointCoordinatorImpl implements SubtaskCheckpointCoordinator {
checkpointOptions.isUnalignedCheckpoint());
checkpointMetrics.setSyncDurationMillis((System.nanoTime() - started) / 1_000_000);
- checkpointMetrics.setUnalignedCheckpoint(checkpointOptions.isUnalignedCheckpoint());
return true;
}