You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ro...@apache.org on 2024/04/03 21:50:36 UTC

(flink) branch master updated (d301839dfe2 -> f86c0804121)

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

roman pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


    from d301839dfe2 [FLINK-35000][build] Updates link to test code convention in pull request template
     new 875683082a5 [FLINK-34994][tests] Ignore unknown task checkpoint confirmation log in JobIDLoggingITCase
     new f86c0804121 [hotfix] Log JobID in checkpoint abort message if available

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../flink/runtime/taskexecutor/TaskExecutor.java       | 18 ++++++++++--------
 .../org/apache/flink/test/misc/JobIDLoggingITCase.java |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)


(flink) 01/02: [FLINK-34994][tests] Ignore unknown task checkpoint confirmation log in JobIDLoggingITCase

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

roman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 875683082a58636b377bbb0a82bac4d273455e6e
Author: Roman Khachatryan <kh...@gmail.com>
AuthorDate: Wed Apr 3 10:19:34 2024 +0200

    [FLINK-34994][tests] Ignore unknown task checkpoint confirmation log in JobIDLoggingITCase
---
 .../src/test/java/org/apache/flink/test/misc/JobIDLoggingITCase.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/JobIDLoggingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/JobIDLoggingITCase.java
index fb4e27604fe..0d99a9fce80 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/misc/JobIDLoggingITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/misc/JobIDLoggingITCase.java
@@ -153,6 +153,8 @@ class JobIDLoggingITCase {
                         "Received task .*",
                         "Trigger checkpoint .*",
                         "Confirm completed checkpoint .*"),
+                "TaskManager received a checkpoint confirmation for unknown task.*",
+                "TaskManager received an aborted checkpoint for unknown task.*",
                 "Un-registering task.*",
                 "Successful registration.*",
                 "Establish JobManager connection.*",


(flink) 02/02: [hotfix] Log JobID in checkpoint abort message if available

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

roman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit f86c08041211bbeddf36c9ff0fbe6ae4abaa3b9d
Author: Roman Khachatryan <kh...@gmail.com>
AuthorDate: Wed Apr 3 10:23:14 2024 +0200

    [hotfix] Log JobID in checkpoint abort message if available
---
 .../flink/runtime/taskexecutor/TaskExecutor.java       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
index 99b4ca7d370..f26e9ef7610 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
@@ -1116,18 +1116,20 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway {
             long checkpointId,
             long latestCompletedCheckpointId,
             long checkpointTimestamp) {
-        log.debug(
-                "Abort checkpoint {}@{} for {}.",
-                checkpointId,
-                checkpointTimestamp,
-                executionAttemptID);
-
         final Task task = taskSlotTable.getTask(executionAttemptID);
 
         if (task != null) {
-            task.notifyCheckpointAborted(checkpointId, latestCompletedCheckpointId);
+            try (MdcCloseable ignored =
+                    MdcUtils.withContext(MdcUtils.asContextData(task.getJobID()))) {
+                log.debug(
+                        "Abort checkpoint {}@{} for {}.",
+                        checkpointId,
+                        checkpointTimestamp,
+                        executionAttemptID);
+                task.notifyCheckpointAborted(checkpointId, latestCompletedCheckpointId);
 
-            return CompletableFuture.completedFuture(Acknowledge.get());
+                return CompletableFuture.completedFuture(Acknowledge.get());
+            }
         } else {
             final String message =
                     "TaskManager received an aborted checkpoint for unknown task "