[flink] branch release-1.14 updated: [hotfix] Improve language for error message when checkpoint is declined due to some tasks being finished already.

[sewen]

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

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


The following commit(s) were added to refs/heads/release-1.14 by this push:
     new 7b213e4  [hotfix] Improve language for error message when checkpoint 
is declined due to some tasks being finished already.
7b213e4 is described below

commit 7b213e4946cebbf9235363a662f6d7435ebc232a
Author: Stephan Ewen <se...@apache.org>
AuthorDate: Fri Aug 27 02:26:27 2021 +0200

    [hotfix] Improve language for error message when checkpoint is declined due 
to some tasks being finished already.
---
 .../org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java    | 2 +-
 .../flink/runtime/checkpoint/DefaultCheckpointPlanCalculator.java     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
index cf5e7b2..a51a63f 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
@@ -894,7 +894,7 @@ public class CheckpointCoordinator {
                 }
             } else {
                 LOG.info(
-                        "Failed to trigger checkpoint for job {} since {}",
+                        "Failed to trigger checkpoint for job {} because {}",
                         job,
                         throwable.getMessage());
             }
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultCheckpointPlanCalculator.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultCheckpointPlanCalculator.java
index eb34ab7..a6874f1 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultCheckpointPlanCalculator.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultCheckpointPlanCalculator.java
@@ -91,9 +91,7 @@ public class DefaultCheckpointPlanCalculator implements 
CheckpointPlanCalculator
                     try {
                         if (context.hasFinishedTasks() && 
!allowCheckpointsAfterTasksFinished) {
                             throw new CheckpointException(
-                                    String.format(
-                                            "some tasks of job %s has been 
finished, abort the checkpoint",
-                                            jobId),
+                                    "Some tasks of the job have already 
finished and checkpointing with finished tasks is not enabled.",
                                     
CheckpointFailureReason.NOT_ALL_REQUIRED_TASKS_RUNNING);
                         }