[hotfix] [webfrontend] Rename 'pending' subtask stat to 'pending_or_failed'
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/27a1e759 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/27a1e759 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/27a1e759 Branch: refs/heads/release-1.2 Commit: 27a1e75919fcca911e24b1cbc7bf265c811c9914 Parents: 772884e Author: Ufuk Celebi <[email protected]> Authored: Wed Jan 18 18:32:14 2017 +0100 Committer: Ufuk Celebi <[email protected]> Committed: Thu Jan 19 15:04:24 2017 +0100 ---------------------------------------------------------------------- .../checkpoints/CheckpointStatsDetailsSubtasksHandler.java | 2 +- .../checkpoints/CheckpointStatsSubtaskDetailsHandlerTest.java | 2 +- .../app/partials/jobs/job.plan.node.checkpoints.details.jade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/27a1e759/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsDetailsSubtasksHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsDetailsSubtasksHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsDetailsSubtasksHandler.java index 3e3088b..00195b5 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsDetailsSubtasksHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsDetailsSubtasksHandler.java @@ -168,7 +168,7 @@ public class CheckpointStatsDetailsSubtasksHandler extends AbstractExecutionGrap gen.writeNumberField("duration", subtask.getAlignmentDuration()); gen.writeEndObject(); } else { - gen.writeStringField("status", "pending"); + gen.writeStringField("status", "pending_or_failed"); } gen.writeEndObject(); } http://git-wip-us.apache.org/repos/asf/flink/blob/27a1e759/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsSubtaskDetailsHandlerTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsSubtaskDetailsHandlerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsSubtaskDetailsHandlerTest.java index 70212fc..8b7201d 100644 --- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsSubtaskDetailsHandlerTest.java +++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsSubtaskDetailsHandlerTest.java @@ -310,7 +310,7 @@ public class CheckpointStatsSubtaskDetailsHandlerTest { private static void verifySubtaskStats(JsonNode subtaskNode, int index, SubtaskStateStats subtask) { if (subtask == null) { assertEquals(index, subtaskNode.get("index").asInt()); - assertEquals("pending", subtaskNode.get("status").asText()); + assertEquals("pending_or_failed", subtaskNode.get("status").asText()); } else { assertEquals(subtask.getSubtaskIndex(), subtaskNode.get("index").asInt()); assertEquals("completed", subtaskNode.get("status").asText()); http://git-wip-us.apache.org/repos/asf/flink/blob/27a1e759/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.checkpoints.details.jade ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.checkpoints.details.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.checkpoints.details.jade index e2b1038..401a426 100644 --- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.checkpoints.details.jade +++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.checkpoints.details.jade @@ -145,7 +145,7 @@ div(ng-if="checkpoint") td {{ subtask['checkpoint']['async'] | humanizeDuration }} td {{ subtask['alignment']['buffered'] | humanizeBytes}} td(ng-if-end) {{ subtask['alignment']['duration'] | humanizeDuration }} - td(ng-if="subtask['status'] == 'pending'" colspan=7) n/a + td(ng-if="subtask['status'] == 'pending_or_failed'" colspan=7) n/a div(ng-if="!checkpoint") p(ng-if="unknown_checkpoint" role="alert").alert.alert-danger
