This is an automated email from the ASF dual-hosted git repository. dwysakowicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 9d449ff540b5e0d4e97d8a0377438f8ed1b70a6e Author: Anton Kalashnikov <[email protected]> AuthorDate: Tue Jun 22 20:18:45 2021 +0300 [FLINK-23041][webui] Renamed alignment_timeout to aligned_checkpoint_timeout in WebUI This closes #16227 --- docs/content/docs/ops/state/unaligned_checkpoints.md | 14 ++++++++------ .../generated/execution_checkpointing_configuration.html | 2 +- docs/layouts/shortcodes/generated/rest_v1_dispatcher.html | 6 +++--- flink-runtime-web/src/test/resources/rest_api_v1.snapshot | 2 +- .../web-dashboard/src/app/interfaces/job-checkpoint.ts | 2 +- .../pages/job/checkpoints/job-checkpoints.component.html | 4 ++-- .../rest/messages/checkpoints/CheckpointConfigInfo.java | 14 +++++++------- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/docs/content/docs/ops/state/unaligned_checkpoints.md b/docs/content/docs/ops/state/unaligned_checkpoints.md index 01ae924..b47e43e 100644 --- a/docs/content/docs/ops/state/unaligned_checkpoints.md +++ b/docs/content/docs/ops/state/unaligned_checkpoints.md @@ -37,23 +37,25 @@ backpressure. Then, checkpointing time becomes mostly independent of the end-to- aware unaligned checkpointing adds to I/O to the state storage, so you shouldn't use it when the I/O to the state storage is actually the bottleneck during checkpointing. -### Alignment timeout +### Aligned checkpoint timeout -After enabling unaligned checkpoints, you can also specify the alignment timeout programmatically: +After enabling unaligned checkpoints, you can also specify the aligned checkpoint timeout +programmatically: ```java StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); -env.getCheckpointConfig().setAlignmentTimeout(Duration.ofSeconds(30)); +env.getCheckpointConfig().setAlignedCheckpointTimeout(Duration.ofSeconds(30)); ``` or in the `flink-conf.yml` configuration file: ``` -execution.checkpointing.alignment-timeout: 30 s +execution.checkpointing.aligned-checkpoint-timeout: 30 s ``` -When activated, each checkpoint will still begin as an aligned checkpoint, but if the alignment time -for some subtask exceeds this timeout, then the checkpoint will proceed as an unaligned checkpoint. +When activated, each checkpoint will still begin as an aligned checkpoint, but if the time between +the start of the global checkpoint and the start of the checkpoint on a subtask exceeds the aligned +checkpoint timeout, then the checkpoint will proceed as an unaligned checkpoint. ## Limitations diff --git a/docs/layouts/shortcodes/generated/execution_checkpointing_configuration.html b/docs/layouts/shortcodes/generated/execution_checkpointing_configuration.html index 90b6e9bd..371fc73 100644 --- a/docs/layouts/shortcodes/generated/execution_checkpointing_configuration.html +++ b/docs/layouts/shortcodes/generated/execution_checkpointing_configuration.html @@ -9,7 +9,7 @@ </thead> <tbody> <tr> - <td><h5>execution.checkpointing.alignment-timeout</h5></td> + <td><h5>execution.checkpointing.aligned-checkpoint-timeout</h5></td> <td style="word-wrap: break-word;">0 ms</td> <td>Duration</td> <td>Only relevant if <code class="highlighter-rouge">execution.checkpointing.unaligned</code> is enabled.<br /><br />If timeout is 0, checkpoints will always start unaligned.<br /><br />If timeout has a positive value, checkpoints will start aligned. If during checkpointing, checkpoint start delay exceeds this timeout, alignment will timeout and checkpoint barrier will start working as unaligned checkpoint.</td> diff --git a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html index 522eba6..2329226 100644 --- a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html +++ b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html @@ -101,10 +101,10 @@ "type" : "object", "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:DashboardConfiguration:Features", "properties" : { - "web-submit" : { + "web-cancel" : { "type" : "boolean" }, - "web-cancel" : { + "web-submit" : { "type" : "boolean" } } @@ -2181,7 +2181,7 @@ Using 'curl' you can upload a jar via 'curl -X POST -H "Expect:" -F "jarfile=@pa "type" : "object", "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:CheckpointConfigInfo", "properties" : { - "alignment_timeout" : { + "aligned_checkpoint_timeout" : { "type" : "integer" }, "checkpoint_storage" : { diff --git a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot index d64a73a..fb7fd70 100644 --- a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot +++ b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot @@ -1258,7 +1258,7 @@ "tolerable_failed_checkpoints" : { "type" : "integer" }, - "alignment_timeout" : { + "aligned_checkpoint_timeout" : { "type" : "integer" } } diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/job-checkpoint.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/job-checkpoint.ts index b850215..7e7c441 100644 --- a/flink-runtime-web/web-dashboard/src/app/interfaces/job-checkpoint.ts +++ b/flink-runtime-web/web-dashboard/src/app/interfaces/job-checkpoint.ts @@ -119,7 +119,7 @@ export interface CheckPointConfigInterface { checkpoint_storage: string; unaligned_checkpoints: boolean; tolerable_failed_checkpoints: number; - alignment_timeout: number; + aligned_checkpoint_timeout: number; } export interface CheckPointDetailInterface { diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/checkpoints/job-checkpoints.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job/checkpoints/job-checkpoints.component.html index 00cb2c7..e7aeb5b 100644 --- a/flink-runtime-web/web-dashboard/src/app/pages/job/checkpoints/job-checkpoints.component.html +++ b/flink-runtime-web/web-dashboard/src/app/pages/job/checkpoints/job-checkpoints.component.html @@ -253,8 +253,8 @@ <td>{{ checkPointConfig['unaligned_checkpoints'] ? 'Enabled' : 'Disabled' }}</td> </tr> <tr *ngIf="checkPointConfig['unaligned_checkpoints']"> - <td>Alignment timeout</td> - <td>{{ checkPointConfig['alignment_timeout'] | humanizeDuration}}</td> + <td>Aligned checkpoint timeout</td> + <td>{{ checkPointConfig['aligned_checkpoint_timeout'] | humanizeDuration}}</td> </tr> <tr *ngIf="checkPointConfig['externalization']"> <td>Persist Checkpoints Externally</td> diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointConfigInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointConfigInfo.java index e5ca260..56598d6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointConfigInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointConfigInfo.java @@ -60,7 +60,7 @@ public class CheckpointConfigInfo implements ResponseBody { public static final String FIELD_NAME_TOLERABLE_FAILED_CHECKPOINTS = "tolerable_failed_checkpoints"; - public static final String FIELD_NAME_ALIGNMENT_TIMEOUT = "alignment_timeout"; + public static final String FIELD_NAME_ALIGNED_CHECKPOINT_TIMEOUT = "aligned_checkpoint_timeout"; @JsonProperty(FIELD_NAME_PROCESSING_MODE) private final ProcessingMode processingMode; @@ -92,8 +92,8 @@ public class CheckpointConfigInfo implements ResponseBody { @JsonProperty(FIELD_NAME_TOLERABLE_FAILED_CHECKPOINTS) private final int tolerableFailedCheckpoints; - @JsonProperty(FIELD_NAME_ALIGNMENT_TIMEOUT) - private final long alignmentTimeout; + @JsonProperty(FIELD_NAME_ALIGNED_CHECKPOINT_TIMEOUT) + private final long alignedCheckpointTimeout; @JsonCreator public CheckpointConfigInfo( @@ -108,7 +108,7 @@ public class CheckpointConfigInfo implements ResponseBody { @JsonProperty(FIELD_NAME_CHECKPOINT_STORAGE) String checkpointStorage, @JsonProperty(FIELD_NAME_UNALIGNED_CHECKPOINTS) boolean unalignedCheckpoints, @JsonProperty(FIELD_NAME_TOLERABLE_FAILED_CHECKPOINTS) int tolerableFailedCheckpoints, - @JsonProperty(FIELD_NAME_ALIGNMENT_TIMEOUT) long alignmentTimeout) { + @JsonProperty(FIELD_NAME_ALIGNED_CHECKPOINT_TIMEOUT) long alignedCheckpointTimeout) { this.processingMode = Preconditions.checkNotNull(processingMode); this.checkpointInterval = checkpointInterval; this.checkpointTimeout = checkpointTimeout; @@ -119,7 +119,7 @@ public class CheckpointConfigInfo implements ResponseBody { this.checkpointStorage = Preconditions.checkNotNull(checkpointStorage); this.unalignedCheckpoints = unalignedCheckpoints; this.tolerableFailedCheckpoints = tolerableFailedCheckpoints; - this.alignmentTimeout = alignmentTimeout; + this.alignedCheckpointTimeout = alignedCheckpointTimeout; } @Override @@ -141,7 +141,7 @@ public class CheckpointConfigInfo implements ResponseBody { && Objects.equals(checkpointStorage, that.checkpointStorage) && unalignedCheckpoints == that.unalignedCheckpoints && tolerableFailedCheckpoints == that.tolerableFailedCheckpoints - && alignmentTimeout == that.alignmentTimeout; + && alignedCheckpointTimeout == that.alignedCheckpointTimeout; } @Override @@ -157,7 +157,7 @@ public class CheckpointConfigInfo implements ResponseBody { checkpointStorage, unalignedCheckpoints, tolerableFailedCheckpoints, - alignmentTimeout); + alignedCheckpointTimeout); } /** Contains information about the externalized checkpoint configuration. */
