You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gu...@apache.org on 2024/10/01 01:55:07 UTC
(flink) 02/02: [FLINK-36355][runtime] Remove deprecated fields in TaskManagerMetricsInfo
This is an automated email from the ASF dual-hosted git repository.
guoweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 96cd839c135e5b2d624bf4efc41d15dc9ad71560
Author: yunfengzhou-hub <yu...@outlook.com>
AuthorDate: Mon Sep 30 16:44:49 2024 +0800
[FLINK-36355][runtime] Remove deprecated fields in TaskManagerMetricsInfo
---
.../shortcodes/generated/rest_v1_dispatcher.html | 8 +--
docs/static/generated/rest_v1_dispatcher.yml | 10 +---
.../src/test/resources/rest_api_v1.snapshot | 6 --
.../src/app/interfaces/task-manager.ts | 2 -
.../rest/handler/job/SubtasksTimesHandler.java | 3 +-
.../taskmanager/TaskManagerDetailsHeaders.java | 2 +-
.../taskmanager/TaskManagerMetricsInfo.java | 69 ----------------------
.../rest/messages/SubtasksTimesInfoTest.java | 9 +--
8 files changed, 7 insertions(+), 102 deletions(-)
diff --git a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html
index c263d20d551..a9312dacefd 100644
--- a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html
+++ b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html
@@ -5313,7 +5313,7 @@ Using 'curl' you can upload a jar via 'curl -X POST -H "Expect:" -F "jarfile=@pa
<td class="text-left">Response code: <code>200 OK</code></td>
</tr>
<tr>
- <td colspan="2">Returns details for a task manager. "metrics.memorySegmentsAvailable" and "metrics.memorySegmentsTotal" are deprecated. Please use "metrics.nettyShuffleMemorySegmentsAvailable" and "metrics.nettyShuffleMemorySegmentsTotal" instead.</td>
+ <td colspan="2">Returns details for a task manager.</td>
</tr>
<tr>
<td colspan="2">Path parameters</td>
@@ -5481,12 +5481,6 @@ Using 'curl' you can upload a jar via 'curl -X POST -H "Expect:" -F "jarfile=@pa
"mappedUsed" : {
"type" : "integer"
},
- "memorySegmentsAvailable" : {
- "type" : "integer"
- },
- "memorySegmentsTotal" : {
- "type" : "integer"
- },
"nettyShuffleMemoryAvailable" : {
"type" : "integer"
},
diff --git a/docs/static/generated/rest_v1_dispatcher.yml b/docs/static/generated/rest_v1_dispatcher.yml
index ccaa7c6bc24..adedec2ec5d 100644
--- a/docs/static/generated/rest_v1_dispatcher.yml
+++ b/docs/static/generated/rest_v1_dispatcher.yml
@@ -1580,9 +1580,7 @@ paths:
$ref: '#/components/schemas/AggregatedMetricsResponseBody'
/taskmanagers/{taskmanagerid}:
get:
- description: Returns details for a task manager. "metrics.memorySegmentsAvailable"
- and "metrics.memorySegmentsTotal" are deprecated. Please use "metrics.nettyShuffleMemorySegmentsAvailable"
- and "metrics.nettyShuffleMemorySegmentsTotal" instead.
+ description: Returns details for a task manager.
operationId: getTaskManagerDetails
parameters:
- name: taskmanagerid
@@ -3334,12 +3332,6 @@ components:
mappedUsed:
type: integer
format: int64
- memorySegmentsAvailable:
- type: integer
- format: int64
- memorySegmentsTotal:
- type: integer
- format: int64
nettyShuffleMemoryAvailable:
type: integer
format: int64
diff --git a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot
index d7fa43da339..5624a5d8f89 100644
--- a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot
+++ b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot
@@ -3963,12 +3963,6 @@
"mappedMax" : {
"type" : "integer"
},
- "memorySegmentsAvailable" : {
- "type" : "integer"
- },
- "memorySegmentsTotal" : {
- "type" : "integer"
- },
"nettyShuffleMemorySegmentsAvailable" : {
"type" : "integer"
},
diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/task-manager.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/task-manager.ts
index c0865d2d0a6..0c56202b673 100644
--- a/flink-runtime-web/web-dashboard/src/app/interfaces/task-manager.ts
+++ b/flink-runtime-web/web-dashboard/src/app/interfaces/task-manager.ts
@@ -91,8 +91,6 @@ interface Metrics {
mappedCount: number;
mappedUsed: number;
mappedMax: number;
- memorySegmentsAvailable: number;
- memorySegmentsTotal: number;
garbageCollectors: GarbageCollectorsItem[];
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java
index 0ffea393bd7..e8e20fda7b8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java
@@ -123,8 +123,7 @@ public class SubtasksTimesHandler
}
subtasks.add(
- new SubtasksTimesInfo.SubtaskTimeInfo(
- num++, endpoint, duration, timestampMap));
+ new SubtasksTimesInfo.SubtaskTimeInfo(num++, endpoint, duration, timestampMap));
}
return new SubtasksTimesInfo(id, name, now, subtasks);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerDetailsHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerDetailsHeaders.java
index dc8ceb2f340..d5286ebd09d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerDetailsHeaders.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerDetailsHeaders.java
@@ -72,6 +72,6 @@ public class TaskManagerDetailsHeaders
@Override
public String getDescription() {
- return "Returns details for a task manager. \"metrics.memorySegmentsAvailable\" and \"metrics.memorySegmentsTotal\" are deprecated. Please use \"metrics.nettyShuffleMemorySegmentsAvailable\" and \"metrics.nettyShuffleMemorySegmentsTotal\" instead.";
+ return "Returns details for a task manager.";
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerMetricsInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerMetricsInfo.java
index 89594764946..c596b2707e3 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerMetricsInfo.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerMetricsInfo.java
@@ -54,13 +54,6 @@ public class TaskManagerMetricsInfo {
public static final String FIELD_NAME_MAPPED_MAX = "mappedMax";
- @Deprecated
- public static final String FIELD_NAME_NETWORK_MEMORY_SEGMENTS_AVAILABLE =
- "memorySegmentsAvailable";
-
- @Deprecated
- public static final String FIELD_NAME_NETWORK_MEMORY_SEGMENTS_TOTAL = "memorySegmentsTotal";
-
public static final String FIELD_NAME_SHUFFLE_MEMORY_SEGMENTS_AVAILABLE =
"nettyShuffleMemorySegmentsAvailable";
@@ -147,50 +140,6 @@ public class TaskManagerMetricsInfo {
@JsonProperty(FIELD_NAME_GARBAGE_COLLECTORS)
private final List<GarbageCollectorInfo> garbageCollectorsInfo;
- public TaskManagerMetricsInfo(
- long heapUsed,
- long heapCommitted,
- long heapMax,
- long nonHeapUsed,
- long nonHeapCommitted,
- long nonHeapMax,
- long directCount,
- long directUsed,
- long directMax,
- long mappedCount,
- long mappedUsed,
- long mappedMax,
- long shuffleMemorySegmentsAvailable,
- long shuffleMemorySegmentsUsed,
- long shuffleMemorySegmentsTotal,
- long shuffleMemoryAvailable,
- long shuffleMemoryUsed,
- long shuffleMemoryTotal,
- List<GarbageCollectorInfo> garbageCollectorsInfo) {
- this(
- heapUsed,
- heapCommitted,
- heapMax,
- nonHeapUsed,
- nonHeapCommitted,
- nonHeapMax,
- directCount,
- directUsed,
- directMax,
- mappedCount,
- mappedUsed,
- mappedMax,
- -1,
- -1,
- shuffleMemorySegmentsAvailable,
- shuffleMemorySegmentsUsed,
- shuffleMemorySegmentsTotal,
- shuffleMemoryAvailable,
- shuffleMemoryUsed,
- shuffleMemoryTotal,
- garbageCollectorsInfo);
- }
-
@JsonCreator
public TaskManagerMetricsInfo(
@JsonProperty(FIELD_NAME_HEAP_USED) long heapUsed,
@@ -205,10 +154,6 @@ public class TaskManagerMetricsInfo {
@JsonProperty(FIELD_NAME_MAPPED_COUNT) long mappedCount,
@JsonProperty(FIELD_NAME_MAPPED_USED) long mappedUsed,
@JsonProperty(FIELD_NAME_MAPPED_MAX) long mappedMax,
- @JsonProperty(FIELD_NAME_NETWORK_MEMORY_SEGMENTS_AVAILABLE)
- long ignoredNetworkMemorySegmentsAvailable,
- @JsonProperty(FIELD_NAME_NETWORK_MEMORY_SEGMENTS_TOTAL)
- long ignoredNetworkMemorySegmentsTotal,
@JsonProperty(FIELD_NAME_SHUFFLE_MEMORY_SEGMENTS_AVAILABLE)
long shuffleMemorySegmentsAvailable,
@JsonProperty(FIELD_NAME_SHUFFLE_MEMORY_SEGMENTS_USED) long shuffleMemorySegmentsUsed,
@@ -239,18 +184,6 @@ public class TaskManagerMetricsInfo {
this.garbageCollectorsInfo = Preconditions.checkNotNull(garbageCollectorsInfo);
}
- @Deprecated
- @JsonProperty(FIELD_NAME_NETWORK_MEMORY_SEGMENTS_AVAILABLE)
- private long getMemorySegmentsAvailable() {
- return this.shuffleMemorySegmentsAvailable;
- }
-
- @Deprecated
- @JsonProperty(FIELD_NAME_NETWORK_MEMORY_SEGMENTS_TOTAL)
- private long getMemorySegmentsTotal() {
- return this.shuffleMemorySegmentsTotal;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -371,8 +304,6 @@ public class TaskManagerMetricsInfo {
0L,
0L,
0L,
- 0L,
- 0L,
Collections.emptyList());
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/SubtasksTimesInfoTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/SubtasksTimesInfoTest.java
index 3c413d3451b..2c997a49cb6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/SubtasksTimesInfoTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/SubtasksTimesInfoTest.java
@@ -45,22 +45,19 @@ class SubtasksTimesInfoTest extends RestResponseMarshallingTestBase<SubtasksTime
subTimeMap1.put(ExecutionState.RUNNING, 1L);
subTimeMap1.put(ExecutionState.FAILED, 2L);
subTimeMap1.put(ExecutionState.CANCELED, 3L);
- subtasks.add(
- new SubtasksTimesInfo.SubtaskTimeInfo(0, "local1:123", 1L, subTimeMap1));
+ subtasks.add(new SubtasksTimesInfo.SubtaskTimeInfo(0, "local1:123", 1L, subTimeMap1));
Map<ExecutionState, Long> subTimeMap2 = new HashMap<>();
subTimeMap2.put(ExecutionState.RUNNING, 4L);
subTimeMap2.put(ExecutionState.FAILED, 5L);
subTimeMap2.put(ExecutionState.CANCELED, 6L);
- subtasks.add(
- new SubtasksTimesInfo.SubtaskTimeInfo(1, "local2:123", 2L, subTimeMap2));
+ subtasks.add(new SubtasksTimesInfo.SubtaskTimeInfo(1, "local2:123", 2L, subTimeMap2));
Map<ExecutionState, Long> subTimeMap3 = new HashMap<>();
subTimeMap3.put(ExecutionState.SCHEDULED, 1L);
subTimeMap3.put(ExecutionState.FAILED, 2L);
subTimeMap3.put(ExecutionState.CANCELING, 3L);
- subtasks.add(
- new SubtasksTimesInfo.SubtaskTimeInfo(2, "local3:123", 3L, subTimeMap3));
+ subtasks.add(new SubtasksTimesInfo.SubtaskTimeInfo(2, "local3:123", 3L, subTimeMap3));
return new SubtasksTimesInfo("testId", "testName", System.currentTimeMillis(), subtasks);
}