[FLINK-32688][runtime] Removes deprecated JobExceptionsInfo.

apache · Aug 23, 2024 · 849728b · 849728b
1 parent 4faf096
commit 849728b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 354 deletions.
diff --git a/...runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java b/...runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
@@ -20,15 +20,11 @@
 
 import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.api.common.time.Time;
-import org.apache.flink.runtime.execution.ExecutionState;
-import org.apache.flink.runtime.executiongraph.AccessExecution;
-import org.apache.flink.runtime.executiongraph.AccessExecutionVertex;
 import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph;
 import org.apache.flink.runtime.executiongraph.ErrorInfo;
 import org.apache.flink.runtime.rest.handler.HandlerRequest;
 import org.apache.flink.runtime.rest.handler.legacy.ExecutionGraphCache;
 import org.apache.flink.runtime.rest.messages.EmptyRequestBody;
-import org.apache.flink.runtime.rest.messages.JobExceptionsInfo;
 import org.apache.flink.runtime.rest.messages.JobExceptionsInfoWithHistory;
 import org.apache.flink.runtime.rest.messages.JobIDPathParameter;
 import org.apache.flink.runtime.rest.messages.MessageHeaders;
@@ -56,7 +52,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -140,37 +135,8 @@ private static JobExceptionsInfoWithHistory createJobExceptionsInfo(
                             failureLabelFilter));
         }
 
-        List<JobExceptionsInfo.ExecutionExceptionInfo> taskExceptionList = new ArrayList<>();
-        boolean truncated = false;
-        for (AccessExecutionVertex task : executionGraph.getAllExecutionVertices()) {
-            for (AccessExecution execution : task.getCurrentExecutions()) {
-                Optional<ErrorInfo> failure = execution.getFailureInfo();
-                if (failure.isPresent()) {
-                    if (taskExceptionList.size() >= exceptionToReportMaxSize) {
-                        truncated = true;
-                        break;
-                    }
-
-                    TaskManagerLocation location = execution.getAssignedResourceLocation();
-                    String locationString = toString(location);
-                    long timestamp = execution.getStateTimestamp(ExecutionState.FAILED);
-                    taskExceptionList.add(
-                            new JobExceptionsInfo.ExecutionExceptionInfo(
-                                    failure.get().getExceptionAsString(),
-                                    task.getTaskNameWithSubtaskIndex(),
-                                    locationString,
-                                    timestamp == 0 ? -1 : timestamp,
-                                    toTaskManagerId(location)));
-                }
-            }
-        }
-
         final ErrorInfo rootCause = executionGraph.getFailureInfo();
         return new JobExceptionsInfoWithHistory(
-                rootCause.getExceptionAsString(),
-                rootCause.getTimestamp(),
-                taskExceptionList,
-                truncated,
                 createJobExceptionHistory(
                         executionGraphInfo.getExceptionHistory(),
                         exceptionToReportMaxSize,

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobExceptionsInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobExceptionsInfo.java
diff --git a/...me/src/main/java/org/apache/flink/runtime/rest/messages/JobExceptionsInfoWithHistory.java b/...me/src/main/java/org/apache/flink/runtime/rest/messages/JobExceptionsInfoWithHistory.java
@@ -38,10 +38,10 @@
 import static org.apache.flink.util.Preconditions.checkNotNull;
 
 /**
- * {@code JobExceptionsInfoWithHistory} extends {@link JobExceptionsInfo} providing a history of
- * previously caused failures. It's the response type of the {@link JobExceptionsHandler}.
+ * {@code JobExceptionsInfoWithHistory} providing a history of previously caused failures. It's the
+ * response type of the {@link JobExceptionsHandler}.
  */
-public class JobExceptionsInfoWithHistory extends JobExceptionsInfo implements ResponseBody {
+public class JobExceptionsInfoWithHistory implements ResponseBody {
 
     public static final String FIELD_NAME_EXCEPTION_HISTORY = "exceptionHistory";
 
@@ -50,19 +50,10 @@ public class JobExceptionsInfoWithHistory extends JobExceptionsInfo implements R
 
     @JsonCreator
     public JobExceptionsInfoWithHistory(
-            @JsonProperty(FIELD_NAME_ROOT_EXCEPTION) String rootException,
-            @JsonProperty(FIELD_NAME_TIMESTAMP) Long rootTimestamp,
-            @JsonProperty(FIELD_NAME_ALL_EXCEPTIONS) List<ExecutionExceptionInfo> allExceptions,
-            @JsonProperty(FIELD_NAME_TRUNCATED) boolean truncated,
             @JsonProperty(FIELD_NAME_EXCEPTION_HISTORY) JobExceptionHistory exceptionHistory) {
-        super(rootException, rootTimestamp, allExceptions, truncated);
         this.exceptionHistory = exceptionHistory;
     }
 
-    public JobExceptionsInfoWithHistory(JobExceptionHistory exceptionHistory) {
-        this(null, null, Collections.emptyList(), false, exceptionHistory);
-    }
-
     @JsonIgnore
     public JobExceptionHistory getExceptionHistory() {
         return exceptionHistory;
@@ -79,30 +70,17 @@ public boolean equals(Object o) {
             return false;
         }
         JobExceptionsInfoWithHistory that = (JobExceptionsInfoWithHistory) o;
-        return this.isTruncated() == that.isTruncated()
-                && Objects.equals(this.getRootException(), that.getRootException())
-                && Objects.equals(this.getRootTimestamp(), that.getRootTimestamp())
-                && Objects.equals(this.getAllExceptions(), that.getAllExceptions())
-                && Objects.equals(exceptionHistory, that.exceptionHistory);
+        return Objects.equals(exceptionHistory, that.exceptionHistory);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(
-                isTruncated(),
-                getRootException(),
-                getRootTimestamp(),
-                getAllExceptions(),
-                exceptionHistory);
+        return Objects.hash(exceptionHistory);
     }
 
     @Override
     public String toString() {
         return new StringJoiner(", ", JobExceptionsInfoWithHistory.class.getSimpleName() + "[", "]")
-                .add("rootException='" + getRootException() + "'")
-                .add("rootTimestamp=" + getRootTimestamp())
-                .add("allExceptions=" + getAllExceptions())
-                .add("truncated=" + isTruncated())
                 .add("exceptionHistory=" + exceptionHistory)
                 .toString();
     }