forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-14816] Let TaskManagerThreadDumpHandler return JSON response
Instead of serving plain text, this commit changes the TaskManagerThreadDumpHandler to return a JSON response. This allows to further extend this handler to not only generate a thread dump of all threads but also for a sub set. Morever, it allows to return a more structured return value in the future. This closes apache#11887.
- Loading branch information
1 parent
eeebb59
commit 2f81ac5
Showing
17 changed files
with
362 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
...time/src/main/java/org/apache/flink/runtime/rest/messages/taskmanager/ThreadDumpInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.rest.messages.taskmanager; | ||
|
|
||
| import org.apache.flink.runtime.rest.messages.ResponseBody; | ||
|
|
||
| import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; | ||
| import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Collection; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * Class containing thread dump information. | ||
| */ | ||
| public class ThreadDumpInfo implements ResponseBody, Serializable { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| public static final String FIELD_NAME_THREAD_INFOS = "threadInfos"; | ||
|
|
||
| @JsonProperty(FIELD_NAME_THREAD_INFOS) | ||
| private final Collection<ThreadInfo> threadInfos; | ||
|
|
||
| private ThreadDumpInfo(Collection<ThreadInfo> threadInfos) { | ||
| this.threadInfos = threadInfos; | ||
| } | ||
|
|
||
| public Collection<ThreadInfo> getThreadInfos() { | ||
| return threadInfos; | ||
| } | ||
|
|
||
| @JsonCreator | ||
| public static ThreadDumpInfo create( | ||
| @JsonProperty(FIELD_NAME_THREAD_INFOS) Collection<ThreadInfo> threadInfos) { | ||
| return new ThreadDumpInfo(threadInfos); | ||
| } | ||
|
|
||
| /** | ||
| * Class containing information about a thread. | ||
| */ | ||
| public static final class ThreadInfo implements Serializable { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| public static final String FIELD_NAME_THREAD_NAME = "threadName"; | ||
|
|
||
| public static final String FIELD_NAME_THREAD_INFO = "stringifiedThreadInfo"; | ||
|
|
||
| @JsonProperty(FIELD_NAME_THREAD_NAME) | ||
| private final String threadName; | ||
|
|
||
| @JsonProperty(FIELD_NAME_THREAD_INFO) | ||
| private final String stringifiedThreadInfo; | ||
|
|
||
| private ThreadInfo(String threadName, String stringifiedThreadInfo) { | ||
| this.threadName = threadName; | ||
| this.stringifiedThreadInfo = stringifiedThreadInfo; | ||
| } | ||
|
|
||
| @JsonCreator | ||
| public static ThreadInfo create( | ||
| @JsonProperty(FIELD_NAME_THREAD_NAME) String threadName, | ||
| @JsonProperty(FIELD_NAME_THREAD_INFO) String stringifiedThreadInfo) { | ||
| return new ThreadInfo(threadName, stringifiedThreadInfo); | ||
| } | ||
|
|
||
| public String getThreadName() { | ||
| return threadName; | ||
| } | ||
|
|
||
| public String getStringifiedThreadInfo() { | ||
| return stringifiedThreadInfo; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return stringifiedThreadInfo; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| ThreadInfo that = (ThreadInfo) o; | ||
| return Objects.equals(threadName, that.threadName) && | ||
| Objects.equals(stringifiedThreadInfo, that.stringifiedThreadInfo); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(threadName, stringifiedThreadInfo); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.