[FLINK-5198] [logging] Improve TaskState toString
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ee478fe2 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ee478fe2 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ee478fe2 Branch: refs/heads/release-1.1 Commit: ee478fe278d5893048f015c2c1cc6dbfc7c68d8b Parents: 7b9a444 Author: Ufuk Celebi <u...@apache.org> Authored: Tue Nov 29 16:15:30 2016 +0100 Committer: Ufuk Celebi <u...@apache.org> Committed: Wed Nov 30 16:22:11 2016 +0100 ---------------------------------------------------------------------- .../flink/runtime/checkpoint/CheckpointCoordinator.java | 8 ++++++-- .../org/apache/flink/runtime/checkpoint/TaskState.java | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/ee478fe2/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java ---------------------------------------------------------------------- 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 0cf944c..24cc3cb 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 @@ -693,9 +693,13 @@ public class CheckpointCoordinator { if (LOG.isDebugEnabled()) { StringBuilder builder = new StringBuilder(); - for (Map.Entry<JobVertexID, TaskState> entry : completed.getTaskStates().entrySet()) { - builder.append("JobVertexID: ").append(entry.getKey()).append(" {").append(entry.getValue()).append("}"); + builder.append("Checkpoint state: "); + for (TaskState state : completed.getTaskStates().values()) { + builder.append(state); + builder.append(", "); } + // Remove last two chars ", " + builder.delete(builder.length() - 2, builder.length()); LOG.debug(builder.toString()); } http://git-wip-us.apache.org/repos/asf/flink/blob/ee478fe2/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskState.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskState.java index ac4503d..14f8caa 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskState.java @@ -168,4 +168,16 @@ public class TaskState implements Serializable { public int hashCode() { return parallelism + 31 * Objects.hash(jobVertexID, subtaskStates, kvStates); } + + @Override + public String toString() { + // KvStates are always null in 1.1. Don't print this as it might + // confuse users that don't care about how we store it internally. + return "TaskState(" + + "jobVertexID: " + jobVertexID + + ", parallelism: " + parallelism + + ", sub task states: " + subtaskStates.size() + + ", total size (bytes): " + getStateSize() + + ')'; + } }