[FLINK-9213] Revert checkpoint details URL from '/jobs/:jobid/checkpoints/:checkpointid' to '/jobs/:jobid/checkpoints/details/:checkpointid' as it was in 1.5
This closes #5906. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/547152ea Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/547152ea Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/547152ea Branch: refs/heads/release-1.5 Commit: 547152eadd54f2b0d827b9fd53bf2a0d0a0c893e Parents: 41e2b3e Author: Andrey Zagrebin <[email protected]> Authored: Tue Apr 24 13:26:40 2018 +0200 Committer: zentol <[email protected]> Committed: Wed May 2 15:18:59 2018 +0200 ---------------------------------------------------------------------- docs/_includes/generated/rest_dispatcher.html | 202 +++++++++---------- .../CheckpointStatisticDetailsHeaders.java | 2 +- 2 files changed, 102 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/547152ea/docs/_includes/generated/rest_dispatcher.html ---------------------------------------------------------------------- diff --git a/docs/_includes/generated/rest_dispatcher.html b/docs/_includes/generated/rest_dispatcher.html index 8ac36e1..98c9d42 100644 --- a/docs/_includes/generated/rest_dispatcher.html +++ b/docs/_includes/generated/rest_dispatcher.html @@ -1094,7 +1094,7 @@ <table class="table table-bordered"> <tbody> <tr> - <td class="text-left" colspan="2"><strong>/jobs/:jobid/checkpoints/details/:checkpointid/subtasks/:vertexid</strong></td> + <td class="text-left" colspan="2"><strong>/jobs/:jobid/checkpoints/details/:checkpointid</strong></td> </tr> <tr> <td class="text-left" style="width: 20%">Verb: <code>GET</code></td> @@ -1111,14 +1111,13 @@ <ul> <li><code>jobid</code> - description</li> <li><code>checkpointid</code> - description</li> -<li><code>vertexid</code> - description</li> </ul> </td> </tr> <tr> <td colspan="2"> - <button data-toggle="collapse" data-target="#206551710">Request</button> - <div id="206551710" class="collapse"> + <button data-toggle="collapse" data-target="#2082812513">Request</button> + <div id="2082812513" class="collapse"> <pre> <code> {} </code> @@ -1128,13 +1127,13 @@ </tr> <tr> <td colspan="2"> - <button data-toggle="collapse" data-target="#147094768">Response</button> - <div id="147094768" class="collapse"> + <button data-toggle="collapse" data-target="#59893771">Response</button> + <div id="59893771" class="collapse"> <pre> <code> { "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:CheckpointStatistics", "properties" : { "id" : { "type" : "integer" @@ -1143,6 +1142,12 @@ "type" : "string", "enum" : [ "IN_PROGRESS", "COMPLETED", "FAILED" ] }, + "is_savepoint" : { + "type" : "boolean" + }, + "trigger_timestamp" : { + "type" : "integer" + }, "latest_ack_timestamp" : { "type" : "integer" }, @@ -1161,70 +1166,36 @@ "num_acknowledged_subtasks" : { "type" : "integer" }, - "summary" : { + "tasks" : { "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails:Summary", - "properties" : { - "state_size" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics", - "properties" : { - "min" : { - "type" : "integer" - }, - "max" : { - "type" : "integer" - }, - "avg" : { - "type" : "integer" - } - } - }, - "end_to_end_duration" : { - "type" : "object", - "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" - }, - "checkpoint_duration" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails:CheckpointDuration", - "properties" : { - "sync" : { - "type" : "object", - "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" - }, - "async" : { - "type" : "object", - "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" - } - } - }, - "alignment" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails:CheckpointAlignment", - "properties" : { - "buffered" : { - "type" : "object", - "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" - }, - "duration" : { - "type" : "object", - "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" - } - } - } - } - }, - "subtasks" : { - "type" : "array", - "items" : { + "additionalProperties" : { "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:SubtaskCheckpointStatistics", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatistics", "properties" : { - "index" : { + "id" : { "type" : "integer" }, "status" : { - "type" : "string" + "type" : "string", + "enum" : [ "IN_PROGRESS", "COMPLETED", "FAILED" ] + }, + "latest_ack_timestamp" : { + "type" : "integer" + }, + "state_size" : { + "type" : "integer" + }, + "end_to_end_duration" : { + "type" : "integer" + }, + "alignment_buffered" : { + "type" : "integer" + }, + "num_subtasks" : { + "type" : "integer" + }, + "num_acknowledged_subtasks" : { + "type" : "integer" } } } @@ -1240,7 +1211,7 @@ <table class="table table-bordered"> <tbody> <tr> - <td class="text-left" colspan="2"><strong>/jobs/:jobid/checkpoints/:checkpointid</strong></td> + <td class="text-left" colspan="2"><strong>/jobs/:jobid/checkpoints/details/:checkpointid/subtasks/:vertexid</strong></td> </tr> <tr> <td class="text-left" style="width: 20%">Verb: <code>GET</code></td> @@ -1257,13 +1228,14 @@ <ul> <li><code>jobid</code> - description</li> <li><code>checkpointid</code> - description</li> +<li><code>vertexid</code> - description</li> </ul> </td> </tr> <tr> <td colspan="2"> - <button data-toggle="collapse" data-target="#-968188818">Request</button> - <div id="-968188818" class="collapse"> + <button data-toggle="collapse" data-target="#206551710">Request</button> + <div id="206551710" class="collapse"> <pre> <code> {} </code> @@ -1273,13 +1245,13 @@ </tr> <tr> <td colspan="2"> - <button data-toggle="collapse" data-target="#1303859736">Response</button> - <div id="1303859736" class="collapse"> + <button data-toggle="collapse" data-target="#147094768">Response</button> + <div id="147094768" class="collapse"> <pre> <code> { "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:CheckpointStatistics", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails", "properties" : { "id" : { "type" : "integer" @@ -1288,12 +1260,6 @@ "type" : "string", "enum" : [ "IN_PROGRESS", "COMPLETED", "FAILED" ] }, - "is_savepoint" : { - "type" : "boolean" - }, - "trigger_timestamp" : { - "type" : "integer" - }, "latest_ack_timestamp" : { "type" : "integer" }, @@ -1312,36 +1278,70 @@ "num_acknowledged_subtasks" : { "type" : "integer" }, - "tasks" : { + "summary" : { "type" : "object", - "additionalProperties" : { + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails:Summary", + "properties" : { + "state_size" : { + "type" : "object", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics", + "properties" : { + "min" : { + "type" : "integer" + }, + "max" : { + "type" : "integer" + }, + "avg" : { + "type" : "integer" + } + } + }, + "end_to_end_duration" : { + "type" : "object", + "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" + }, + "checkpoint_duration" : { + "type" : "object", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails:CheckpointDuration", + "properties" : { + "sync" : { + "type" : "object", + "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" + }, + "async" : { + "type" : "object", + "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" + } + } + }, + "alignment" : { + "type" : "object", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatisticsWithSubtaskDetails:CheckpointAlignment", + "properties" : { + "buffered" : { + "type" : "object", + "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" + }, + "duration" : { + "type" : "object", + "$ref" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:MinMaxAvgStatistics" + } + } + } + } + }, + "subtasks" : { + "type" : "array", + "items" : { "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:TaskCheckpointStatistics", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:checkpoints:SubtaskCheckpointStatistics", "properties" : { - "id" : { + "index" : { "type" : "integer" }, "status" : { - "type" : "string", - "enum" : [ "IN_PROGRESS", "COMPLETED", "FAILED" ] - }, - "latest_ack_timestamp" : { - "type" : "integer" - }, - "state_size" : { - "type" : "integer" - }, - "end_to_end_duration" : { - "type" : "integer" - }, - "alignment_buffered" : { - "type" : "integer" - }, - "num_subtasks" : { - "type" : "integer" - }, - "num_acknowledged_subtasks" : { - "type" : "integer" + "type" : "string" } } } http://git-wip-us.apache.org/repos/asf/flink/blob/547152ea/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointStatisticDetailsHeaders.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointStatisticDetailsHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointStatisticDetailsHeaders.java index 3d7ba2b..efdef40 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointStatisticDetailsHeaders.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointStatisticDetailsHeaders.java @@ -32,7 +32,7 @@ public class CheckpointStatisticDetailsHeaders implements MessageHeaders<EmptyRe private static final CheckpointStatisticDetailsHeaders INSTANCE = new CheckpointStatisticDetailsHeaders(); - public static final String URL = "/jobs/:jobid/checkpoints/:checkpointid"; + public static final String URL = "/jobs/:jobid/checkpoints/details/:checkpointid"; private CheckpointStatisticDetailsHeaders() {}
