flink git commit: [FLINK-5628] [webfrontend] Fix serializability of checkpoint stats tracker

2017-01-30 Thread uce 
Repository: flink
Updated Branches:
  refs/heads/release-1.2 f523deca8 -> 3e2e49fd9


[FLINK-5628] [webfrontend] Fix serializability of checkpoint stats tracker

This closes #3215.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3e2e49fd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3e2e49fd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3e2e49fd

Branch: refs/heads/release-1.2
Commit: 3e2e49fd959bc185770b64fa89240f6a7ec80f02
Parents: f523dec
Author: Ufuk Celebi 
Authored: Wed Jan 25 15:42:24 2017 +0100
Committer: Ufuk Celebi 
Committed: Mon Jan 30 16:33:52 2017 +0100

--
 .../checkpoints/CheckpointConfigHandler.java|  8 +-
 .../CheckpointStatsDetailsHandler.java  |  7 +-
 .../CheckpointStatsDetailsSubtasksHandler.java  |  7 +-
 .../checkpoints/CheckpointStatsHandler.java |  7 +-
 .../CheckpointConfigHandlerTest.java| 13 +--
 .../CheckpointStatsDetailsHandlerTest.java  | 13 +--
 .../checkpoints/CheckpointStatsHandlerTest.java |  5 +-
 ...heckpointStatsSubtaskDetailsHandlerTest.java | 13 +--
 .../checkpoint/AbstractCheckpointStats.java |  5 +-
 .../checkpoint/CheckpointStatsHistory.java  |  4 +-
 .../checkpoint/CheckpointStatsTracker.java  | 16 ++--
 .../checkpoint/CompletedCheckpointStats.java| 26 +++---
 .../checkpoint/FailedCheckpointStats.java   | 24 +++---
 .../checkpoint/PendingCheckpointStats.java  |  4 +-
 .../checkpoint/RestoredCheckpointStats.java |  2 +-
 .../runtime/checkpoint/SubtaskStateStats.java   |  8 +-
 .../runtime/checkpoint/TaskStateStats.java  |  9 ++-
 .../executiongraph/AccessExecutionGraph.java| 20 +++--
 .../executiongraph/ArchivedExecutionGraph.java  | 54 -
 .../runtime/executiongraph/ExecutionGraph.java  | 22 -
 .../tasks/ExternalizedCheckpointSettings.java   |  2 +
 .../checkpoint/CheckpointStatsHistoryTest.java  |  1 -
 .../checkpoint/CheckpointStatsSnapshotTest.java | 84 
 .../checkpoint/CompletedCheckpointTest.java | 35 
 .../checkpoint/FailedCheckpointStatsTest.java   | 40 ++
 .../checkpoint/PendingCheckpointStatsTest.java  | 38 +++--
 .../checkpoint/SubtaskStateStatsTest.java   | 36 +
 .../runtime/checkpoint/TaskStateStatsTest.java  | 46 ++-
 .../ArchivedExecutionGraphTest.java |  7 +-
 .../tasks/JobSnapshottingSettingsTest.java  | 59 ++
 30 files changed, 490 insertions(+), 125 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/3e2e49fd/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
--
diff --git 
a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
 
b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
index 1ad5e65..be0d283 100644
--- 
a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
+++ 
b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
@@ -19,7 +19,6 @@
 package org.apache.flink.runtime.webmonitor.handlers.checkpoints;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import org.apache.flink.runtime.checkpoint.CheckpointStatsTracker;
 import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
 import org.apache.flink.runtime.jobgraph.tasks.ExternalizedCheckpointSettings;
 import org.apache.flink.runtime.jobgraph.tasks.JobSnapshottingSettings;
@@ -42,10 +41,13 @@ public class CheckpointConfigHandler extends 
AbstractExecutionGraphRequestHandle
@Override
public String handleRequest(AccessExecutionGraph graph, Map params) throws Exception {
StringWriter writer = new StringWriter();
+
JsonGenerator gen = 
JsonFactory.jacksonFactory.createGenerator(writer);
+   JobSnapshottingSettings settings = 
graph.getJobSnapshottingSettings();
 
-   CheckpointStatsTracker tracker = 
graph.getCheckpointStatsTracker();
-   JobSnapshottingSettings settings = 
tracker.getSnapshottingSettings();
+   if (settings == null) {
+   return "{}";
+   }
 
gen.writeStartObject();
{

http://git-wip-us.apache.org/repos/asf/flink/blob/3e2e49fd/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsDetailsHandler.java
--
diff --git

flink git commit: [FLINK-5628] [webfrontend] Fix serializability of checkpoint stats tracker

2017-01-30 Thread uce 
Repository: flink
Updated Branches:
  refs/heads/master 126fb1779 -> dcfa3fbb0


[FLINK-5628] [webfrontend] Fix serializability of checkpoint stats tracker

This closes #3215.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dcfa3fbb
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dcfa3fbb
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dcfa3fbb

Branch: refs/heads/master
Commit: dcfa3fbb0f17400ebf823e10f803cde8563fff4a
Parents: 126fb17
Author: Ufuk Celebi 
Authored: Wed Jan 25 15:42:24 2017 +0100
Committer: Ufuk Celebi 
Committed: Mon Jan 30 16:33:22 2017 +0100

--
 .../checkpoints/CheckpointConfigHandler.java|  8 +-
 .../CheckpointStatsDetailsHandler.java  |  7 +-
 .../CheckpointStatsDetailsSubtasksHandler.java  |  7 +-
 .../checkpoints/CheckpointStatsHandler.java |  7 +-
 .../CheckpointConfigHandlerTest.java| 13 +--
 .../CheckpointStatsDetailsHandlerTest.java  | 13 +--
 .../checkpoints/CheckpointStatsHandlerTest.java |  5 +-
 ...heckpointStatsSubtaskDetailsHandlerTest.java | 13 +--
 .../checkpoint/AbstractCheckpointStats.java |  5 +-
 .../checkpoint/CheckpointStatsHistory.java  |  4 +-
 .../checkpoint/CheckpointStatsTracker.java  | 16 ++--
 .../checkpoint/CompletedCheckpointStats.java| 26 +++---
 .../checkpoint/FailedCheckpointStats.java   | 24 +++---
 .../checkpoint/PendingCheckpointStats.java  |  4 +-
 .../checkpoint/RestoredCheckpointStats.java |  2 +-
 .../runtime/checkpoint/SubtaskStateStats.java   |  8 +-
 .../runtime/checkpoint/TaskStateStats.java  |  9 ++-
 .../executiongraph/AccessExecutionGraph.java| 20 +++--
 .../executiongraph/ArchivedExecutionGraph.java  | 54 -
 .../runtime/executiongraph/ExecutionGraph.java  | 22 -
 .../tasks/ExternalizedCheckpointSettings.java   |  2 +
 .../checkpoint/CheckpointStatsHistoryTest.java  |  1 -
 .../checkpoint/CheckpointStatsSnapshotTest.java | 84 
 .../checkpoint/CompletedCheckpointTest.java | 35 
 .../checkpoint/FailedCheckpointStatsTest.java   | 40 ++
 .../checkpoint/PendingCheckpointStatsTest.java  | 38 +++--
 .../checkpoint/SubtaskStateStatsTest.java   | 36 +
 .../runtime/checkpoint/TaskStateStatsTest.java  | 46 ++-
 .../ArchivedExecutionGraphTest.java |  7 +-
 .../tasks/JobSnapshottingSettingsTest.java  | 59 ++
 30 files changed, 490 insertions(+), 125 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/dcfa3fbb/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
--
diff --git 
a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
 
b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
index 1ad5e65..be0d283 100644
--- 
a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
+++ 
b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointConfigHandler.java
@@ -19,7 +19,6 @@
 package org.apache.flink.runtime.webmonitor.handlers.checkpoints;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import org.apache.flink.runtime.checkpoint.CheckpointStatsTracker;
 import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
 import org.apache.flink.runtime.jobgraph.tasks.ExternalizedCheckpointSettings;
 import org.apache.flink.runtime.jobgraph.tasks.JobSnapshottingSettings;
@@ -42,10 +41,13 @@ public class CheckpointConfigHandler extends 
AbstractExecutionGraphRequestHandle
@Override
public String handleRequest(AccessExecutionGraph graph, Map params) throws Exception {
StringWriter writer = new StringWriter();
+
JsonGenerator gen = 
JsonFactory.jacksonFactory.createGenerator(writer);
+   JobSnapshottingSettings settings = 
graph.getJobSnapshottingSettings();
 
-   CheckpointStatsTracker tracker = 
graph.getCheckpointStatsTracker();
-   JobSnapshottingSettings settings = 
tracker.getSnapshottingSettings();
+   if (settings == null) {
+   return "{}";
+   }
 
gen.writeStartObject();
{

http://git-wip-us.apache.org/repos/asf/flink/blob/dcfa3fbb/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/checkpoints/CheckpointStatsDetailsHandler.java
--
diff --git