You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/04/19 08:00:24 UTC
[4/9] flink git commit: [FLINK-9199][REST] Fix URLs and remove
subtask index parameter
[FLINK-9199][REST] Fix URLs and remove subtask index parameter
This closes #5865.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dca52bf7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dca52bf7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dca52bf7
Branch: refs/heads/master
Commit: dca52bf783744f98c2b8c40480248d5f11b91171
Parents: 469cab4
Author: Rong Rong <ro...@uber.com>
Authored: Tue Apr 17 23:44:02 2018 -0700
Committer: zentol <ch...@apache.org>
Committed: Thu Apr 19 09:58:15 2018 +0200
----------------------------------------------------------------------
docs/_includes/generated/rest_dispatcher.html | 181 ++++++++++++++++++-
...taskExecutionAttemptAccumulatorsHeaders.java | 2 +-
.../SubtaskExecutionAttemptDetailsHeaders.java | 2 +-
.../AggregatedSubtaskMetricsHeaders.java | 2 +-
.../AggregatedSubtaskMetricsParameters.java | 5 +-
5 files changed, 175 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/dca52bf7/docs/_includes/generated/rest_dispatcher.html
----------------------------------------------------------------------
diff --git a/docs/_includes/generated/rest_dispatcher.html b/docs/_includes/generated/rest_dispatcher.html
index 5889f88..8ac36e1 100644
--- a/docs/_includes/generated/rest_dispatcher.html
+++ b/docs/_includes/generated/rest_dispatcher.html
@@ -311,6 +311,56 @@
<table class="table table-bordered">
<tbody>
<tr>
+ <td class="text-left" colspan="2"><strong>/jobs/metrics</strong></td>
+ </tr>
+ <tr>
+ <td class="text-left" style="width: 20%">Verb: <code>GET</code></td>
+ <td class="text-left">Response code: <code>200 OK</code></td>
+ </tr>
+ <tr>
+ <td colspan="2">description</td>
+ </tr>
+ <tr>
+ <td colspan="2">Query parameters</td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <ul>
+<li><code>get</code> (optional): description</li>
+<li><code>agg</code> (optional): description</li>
+<li><code>jobs</code> (optional): description</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <button data-toggle="collapse" data-target="#-790902571">Request</button>
+ <div id="-790902571" class="collapse">
+ <pre>
+ <code>
+{} </code>
+ </pre>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <button data-toggle="collapse" data-target="#128306770">Response</button>
+ <div id="128306770" class="collapse">
+ <pre>
+ <code>
+{
+ "type" : "any"
+} </code>
+ </pre>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+</table>
+<table class="table table-bordered">
+ <tbody>
+ <tr>
<td class="text-left" colspan="2"><strong>/jobs/overview</strong></td>
</tr>
<tr>
@@ -2208,6 +2258,67 @@
<table class="table table-bordered">
<tbody>
<tr>
+ <td class="text-left" colspan="2"><strong>/jobs/:jobid/vertices/:vertexid/subtasks/metrics</strong></td>
+ </tr>
+ <tr>
+ <td class="text-left" style="width: 20%">Verb: <code>GET</code></td>
+ <td class="text-left">Response code: <code>200 OK</code></td>
+ </tr>
+ <tr>
+ <td colspan="2">description</td>
+ </tr>
+ <tr>
+ <td colspan="2">Path parameters</td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <ul>
+<li><code>jobid</code> - description</li>
+<li><code>vertexid</code> - description</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">Query parameters</td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <ul>
+<li><code>get</code> (optional): description</li>
+<li><code>agg</code> (optional): description</li>
+<li><code>subtasks</code> (optional): description</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <button data-toggle="collapse" data-target="#265134755">Request</button>
+ <div id="265134755" class="collapse">
+ <pre>
+ <code>
+{} </code>
+ </pre>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <button data-toggle="collapse" data-target="#1184344096">Response</button>
+ <div id="1184344096" class="collapse">
+ <pre>
+ <code>
+{
+ "type" : "any"
+} </code>
+ </pre>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+</table>
+<table class="table table-bordered">
+ <tbody>
+ <tr>
<td class="text-left" colspan="2"><strong>/jobs/:jobid/vertices/:vertexid/subtasks/:subtaskindex</strong></td>
</tr>
<tr>
@@ -2313,7 +2424,7 @@
<table class="table table-bordered">
<tbody>
<tr>
- <td class="text-left" colspan="2"><strong>/jobs/:jobid/vertices/:vertexid/subtasks/:subtaskindex/attempts/attempt</strong></td>
+ <td class="text-left" colspan="2"><strong>/jobs/:jobid/vertices/:vertexid/subtasks/:subtaskindex/attempts/:attempt</strong></td>
</tr>
<tr>
<td class="text-left" style="width: 20%">Verb: <code>GET</code></td>
@@ -2337,8 +2448,8 @@
</tr>
<tr>
<td colspan="2">
- <button data-toggle="collapse" data-target="#1633948804">Request</button>
- <div id="1633948804" class="collapse">
+ <button data-toggle="collapse" data-target="#168850740">Request</button>
+ <div id="168850740" class="collapse">
<pre>
<code>
{} </code>
@@ -2348,8 +2459,8 @@
</tr>
<tr>
<td colspan="2">
- <button data-toggle="collapse" data-target="#-384785209">Response</button>
- <div id="-384785209" class="collapse">
+ <button data-toggle="collapse" data-target="#-1849883273">Response</button>
+ <div id="-1849883273" class="collapse">
<pre>
<code>
{
@@ -2419,7 +2530,7 @@
<table class="table table-bordered">
<tbody>
<tr>
- <td class="text-left" colspan="2"><strong>/jobs/:jobid/vertices/:vertexid/subtasks/:subtaskindex/attempts/attempt/accumulators</strong></td>
+ <td class="text-left" colspan="2"><strong>/jobs/:jobid/vertices/:vertexid/subtasks/:subtaskindex/attempts/:attempt/accumulators</strong></td>
</tr>
<tr>
<td class="text-left" style="width: 20%">Verb: <code>GET</code></td>
@@ -2443,8 +2554,8 @@
</tr>
<tr>
<td colspan="2">
- <button data-toggle="collapse" data-target="#1869002000">Request</button>
- <div id="1869002000" class="collapse">
+ <button data-toggle="collapse" data-target="#-1303317920">Request</button>
+ <div id="-1303317920" class="collapse">
<pre>
<code>
{} </code>
@@ -2454,8 +2565,8 @@
</tr>
<tr>
<td colspan="2">
- <button data-toggle="collapse" data-target="#1717045676">Response</button>
- <div id="1717045676" class="collapse">
+ <button data-toggle="collapse" data-target="#-1455274244">Response</button>
+ <div id="-1455274244" class="collapse">
<pre>
<code>
{
@@ -3038,6 +3149,56 @@
<table class="table table-bordered">
<tbody>
<tr>
+ <td class="text-left" colspan="2"><strong>/taskmanagers/metrics</strong></td>
+ </tr>
+ <tr>
+ <td class="text-left" style="width: 20%">Verb: <code>GET</code></td>
+ <td class="text-left">Response code: <code>200 OK</code></td>
+ </tr>
+ <tr>
+ <td colspan="2">description</td>
+ </tr>
+ <tr>
+ <td colspan="2">Query parameters</td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <ul>
+<li><code>get</code> (optional): description</li>
+<li><code>agg</code> (optional): description</li>
+<li><code>taskmanagers</code> (optional): description</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <button data-toggle="collapse" data-target="#521351018">Request</button>
+ <div id="521351018" class="collapse">
+ <pre>
+ <code>
+{} </code>
+ </pre>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <button data-toggle="collapse" data-target="#1440560359">Response</button>
+ <div id="1440560359" class="collapse">
+ <pre>
+ <code>
+{
+ "type" : "any"
+} </code>
+ </pre>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+</table>
+<table class="table table-bordered">
+ <tbody>
+ <tr>
<td class="text-left" colspan="2"><strong>/taskmanagers/:taskmanagerid</strong></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/flink/blob/dca52bf7/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
index 662e87c..5cc159c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
@@ -36,7 +36,7 @@ public class SubtaskExecutionAttemptAccumulatorsHeaders implements MessageHeader
private static final SubtaskExecutionAttemptAccumulatorsHeaders INSTANCE = new SubtaskExecutionAttemptAccumulatorsHeaders();
public static final String URL = String.format(
- "/jobs/:%s/vertices/:%s/subtasks/:%s/attempts/%s/accumulators",
+ "/jobs/:%s/vertices/:%s/subtasks/:%s/attempts/:%s/accumulators",
JobIDPathParameter.KEY,
JobVertexIdPathParameter.KEY,
SubtaskIndexPathParameter.KEY,
http://git-wip-us.apache.org/repos/asf/flink/blob/dca52bf7/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptDetailsHeaders.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptDetailsHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptDetailsHeaders.java
index aa65007..6f8eb21 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptDetailsHeaders.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptDetailsHeaders.java
@@ -36,7 +36,7 @@ public class SubtaskExecutionAttemptDetailsHeaders implements MessageHeaders<Emp
private static final SubtaskExecutionAttemptDetailsHeaders INSTANCE = new SubtaskExecutionAttemptDetailsHeaders();
public static final String URL = String.format(
- "/jobs/:%s/vertices/:%s/subtasks/:%s/attempts/%s",
+ "/jobs/:%s/vertices/:%s/subtasks/:%s/attempts/:%s",
JobIDPathParameter.KEY,
JobVertexIdPathParameter.KEY,
SubtaskIndexPathParameter.KEY,
http://git-wip-us.apache.org/repos/asf/flink/blob/dca52bf7/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsHeaders.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsHeaders.java
index e1d0790..bfeab5f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsHeaders.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsHeaders.java
@@ -38,7 +38,7 @@ public class AggregatedSubtaskMetricsHeaders extends AbstractAggregatedMetricsHe
@Override
public String getTargetRestEndpointURL() {
- return "/jobs/" + JobIDPathParameter.KEY + "/vertices/" + JobVertexIdPathParameter.KEY + "/subtasks/metrics";
+ return "/jobs/:" + JobIDPathParameter.KEY + "/vertices/:" + JobVertexIdPathParameter.KEY + "/subtasks/metrics";
}
public static AggregatedSubtaskMetricsHeaders getInstance() {
http://git-wip-us.apache.org/repos/asf/flink/blob/dca52bf7/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsParameters.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsParameters.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsParameters.java
index 34e1b52..f3969b3 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsParameters.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/AggregatedSubtaskMetricsParameters.java
@@ -21,7 +21,6 @@ package org.apache.flink.runtime.rest.messages.job.metrics;
import org.apache.flink.runtime.rest.messages.JobIDPathParameter;
import org.apache.flink.runtime.rest.messages.JobVertexIdPathParameter;
import org.apache.flink.runtime.rest.messages.MessagePathParameter;
-import org.apache.flink.runtime.rest.messages.SubtaskIndexPathParameter;
import java.util.Arrays;
import java.util.Collection;
@@ -34,7 +33,6 @@ public class AggregatedSubtaskMetricsParameters extends AbstractAggregatedMetric
private final JobIDPathParameter jobId = new JobIDPathParameter();
private final JobVertexIdPathParameter vertexId = new JobVertexIdPathParameter();
- private final SubtaskIndexPathParameter subtaskIndex = new SubtaskIndexPathParameter();
public AggregatedSubtaskMetricsParameters() {
super(new SubtasksFilterQueryParameter());
@@ -44,8 +42,7 @@ public class AggregatedSubtaskMetricsParameters extends AbstractAggregatedMetric
public Collection<MessagePathParameter<?>> getPathParameters() {
return Collections.unmodifiableCollection(Arrays.asList(
jobId,
- vertexId,
- subtaskIndex
+ vertexId
));
}
}