This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 76d1a4678c383a927caf596ee594ba0ae5b5e1df
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Wed Apr 5 14:41:18 2023 +0200
[FLINK-31733] Fix model name clashes
---
docs/static/generated/rest_v1_dispatcher.yml | 129 ++++++++++++++++++---
.../rest/messages/JobVertexTaskManagersInfo.java | 3 +
.../checkpoints/CheckpointingStatistics.java | 3 +
...TaskCheckpointStatisticsWithSubtaskDetails.java | 5 +
.../runtime/rest/messages/job/JobDetailsInfo.java | 3 +
5 files changed, 124 insertions(+), 19 deletions(-)
diff --git a/docs/static/generated/rest_v1_dispatcher.yml
b/docs/static/generated/rest_v1_dispatcher.yml
index 71c00a0ddec..de43e28c617 100644
--- a/docs/static/generated/rest_v1_dispatcher.yml
+++ b/docs/static/generated/rest_v1_dispatcher.yml
@@ -1681,6 +1681,17 @@ components:
processed:
type: integer
format: int64
+ CheckpointAlignmentSummary:
+ type: object
+ properties:
+ buffered:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ duration:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ persisted:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ processed:
+ $ref: '#/components/schemas/StatsSummaryDto'
CheckpointConfigInfo:
type: object
properties:
@@ -1730,6 +1741,13 @@ components:
sync:
type: integer
format: int64
+ CheckpointDurationSummary:
+ type: object
+ properties:
+ async:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ sync:
+ $ref: '#/components/schemas/StatsSummaryDto'
CheckpointInfo:
type: object
properties:
@@ -1792,6 +1810,21 @@ components:
format: int64
discriminator:
propertyName: className
+ CheckpointStatisticsSummary:
+ type: object
+ properties:
+ alignment_buffered:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ checkpointed_size:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ end_to_end_duration:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ persisted_data:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ processed_data:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ state_size:
+ $ref: '#/components/schemas/StatsSummaryDto'
CheckpointStatsStatus:
type: string
enum:
@@ -1823,7 +1856,7 @@ components:
latest:
$ref: '#/components/schemas/LatestCheckpoints'
summary:
- $ref: '#/components/schemas/Summary'
+ $ref: '#/components/schemas/CheckpointStatisticsSummary'
ClusterDataSetEntry:
type: object
properties:
@@ -2323,7 +2356,38 @@ components:
vertices:
type: array
items:
- $ref: '#/components/schemas/JobVertexDetailsInfo'
+ $ref: '#/components/schemas/JobDetailsVertexInfo'
+ JobDetailsVertexInfo:
+ type: object
+ properties:
+ duration:
+ type: integer
+ format: int64
+ end-time:
+ type: integer
+ format: int64
+ id:
+ $ref: '#/components/schemas/JobVertexID'
+ maxParallelism:
+ type: integer
+ format: int32
+ metrics:
+ $ref: '#/components/schemas/IOMetricsInfo'
+ name:
+ type: string
+ parallelism:
+ type: integer
+ format: int32
+ start-time:
+ type: integer
+ format: int64
+ status:
+ $ref: '#/components/schemas/ExecutionState'
+ tasks:
+ type: object
+ additionalProperties:
+ type: integer
+ format: int32
JobExceptionHistory:
type: object
properties:
@@ -2492,6 +2556,33 @@ components:
properties:
parallelism:
$ref: '#/components/schemas/Parallelism'
+ JobVertexTaskManagerInfo:
+ type: object
+ properties:
+ aggregated:
+ $ref: '#/components/schemas/AggregatedTaskDetailsInfo'
+ duration:
+ type: integer
+ format: int64
+ end-time:
+ type: integer
+ format: int64
+ host:
+ type: string
+ metrics:
+ $ref: '#/components/schemas/IOMetricsInfo'
+ start-time:
+ type: integer
+ format: int64
+ status:
+ $ref: '#/components/schemas/ExecutionState'
+ status-counts:
+ type: object
+ additionalProperties:
+ type: integer
+ format: int32
+ taskmanager-id:
+ type: string
JobVertexTaskManagersInfo:
type: object
properties:
@@ -2505,7 +2596,7 @@ components:
taskmanagers:
type: array
items:
- $ref: '#/components/schemas/TaskManagersInfo'
+ $ref: '#/components/schemas/JobVertexTaskManagerInfo'
LatestCheckpoints:
type: object
properties:
@@ -2909,21 +3000,6 @@ components:
type: array
items:
$ref: '#/components/schemas/SubtaskTimeInfo'
- Summary:
- type: object
- properties:
- alignment:
- $ref: '#/components/schemas/CheckpointAlignment'
- checkpoint_duration:
- $ref: '#/components/schemas/CheckpointDuration'
- checkpointed_size:
- $ref: '#/components/schemas/StatsSummaryDto'
- end_to_end_duration:
- $ref: '#/components/schemas/StatsSummaryDto'
- start_delay:
- $ref: '#/components/schemas/StatsSummaryDto'
- state_size:
- $ref: '#/components/schemas/StatsSummaryDto'
TaskCheckpointStatistics:
type: object
properties:
@@ -2999,7 +3075,22 @@ components:
items:
$ref: '#/components/schemas/SubtaskCheckpointStatistics'
summary:
- $ref: '#/components/schemas/Summary'
+ $ref:
'#/components/schemas/TaskCheckpointStatisticsWithSubtaskDetailsSummary'
+ TaskCheckpointStatisticsWithSubtaskDetailsSummary:
+ type: object
+ properties:
+ alignment:
+ $ref: '#/components/schemas/CheckpointAlignmentSummary'
+ checkpoint_duration:
+ $ref: '#/components/schemas/CheckpointDurationSummary'
+ checkpointed_size:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ end_to_end_duration:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ start_delay:
+ $ref: '#/components/schemas/StatsSummaryDto'
+ state_size:
+ $ref: '#/components/schemas/StatsSummaryDto'
TaskExecutorMemoryConfiguration:
type: object
properties:
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexTaskManagersInfo.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexTaskManagersInfo.java
index 7caaf309a1d..de6a3882927 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexTaskManagersInfo.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexTaskManagersInfo.java
@@ -30,6 +30,8 @@ import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonPro
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.v3.oas.annotations.media.Schema;
+
import java.util.Collection;
import java.util.Map;
import java.util.Objects;
@@ -96,6 +98,7 @@ public class JobVertexTaskManagersInfo implements
ResponseBody {
// ---------------------------------------------------
/** Detailed information about task managers. */
+ @Schema(name = "JobVertexTaskManagerInfo")
public static class TaskManagersInfo {
public static final String TASK_MANAGERS_FIELD_HOST = "host";
public static final String TASK_MANAGERS_FIELD_STATUS = "status";
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointingStatistics.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointingStatistics.java
index 1dc249d3e14..83d9d12290d 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointingStatistics.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointingStatistics.java
@@ -25,6 +25,8 @@ import org.apache.flink.util.Preconditions;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
import javax.annotation.Nullable;
import java.util.List;
@@ -198,6 +200,7 @@ public class CheckpointingStatistics implements
ResponseBody {
}
/** Checkpoint summary. */
+ @Schema(name = "CheckpointStatisticsSummary")
public static final class Summary {
public static final String FIELD_NAME_CHECKPOINTED_SIZE =
"checkpointed_size";
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/TaskCheckpointStatisticsWithSubtaskDetails.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/TaskCheckpointStatisticsWithSubtaskDetails.java
index 76ef1e43de5..c5183f4039e 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/TaskCheckpointStatisticsWithSubtaskDetails.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/TaskCheckpointStatisticsWithSubtaskDetails.java
@@ -24,6 +24,8 @@ import org.apache.flink.util.Preconditions;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
import java.util.List;
import java.util.Objects;
@@ -111,6 +113,7 @@ public final class
TaskCheckpointStatisticsWithSubtaskDetails extends TaskCheckp
//
-----------------------------------------------------------------------------------
/** Summary of the checkpoint statistics for a given task. */
+ @Schema(name = "TaskCheckpointStatisticsWithSubtaskDetailsSummary")
public static final class Summary {
public static final String FIELD_NAME_CHECKPOINTED_SIZE =
"checkpointed_size";
@@ -219,6 +222,7 @@ public final class
TaskCheckpointStatisticsWithSubtaskDetails extends TaskCheckp
}
/** Duration of a checkpoint split up into its synchronous and
asynchronous part. */
+ @Schema(name = "CheckpointDurationSummary")
public static final class CheckpointDuration {
public static final String FIELD_NAME_SYNCHRONOUS_DURATION = "sync";
@@ -268,6 +272,7 @@ public final class
TaskCheckpointStatisticsWithSubtaskDetails extends TaskCheckp
}
/** Alignment information for a specific checkpoint at a given task. */
+ @Schema(name = "CheckpointAlignmentSummary")
public static final class CheckpointAlignment {
public static final String FIELD_NAME_BUFFERED_DATA = "buffered";
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/JobDetailsInfo.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/JobDetailsInfo.java
index 784fe545c2c..bd665e0afdb 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/JobDetailsInfo.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/JobDetailsInfo.java
@@ -38,6 +38,8 @@ import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonRaw
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.v3.oas.annotations.media.Schema;
+
import java.util.Collection;
import java.util.Map;
import java.util.Objects;
@@ -259,6 +261,7 @@ public class JobDetailsInfo implements ResponseBody {
// ---------------------------------------------------
/** Detailed information about a job vertex. */
+ @Schema(name = "JobDetailsVertexInfo")
public static final class JobVertexDetailsInfo {
public static final String FIELD_NAME_JOB_VERTEX_ID = "id";
