Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-8367] Migrate SubtaskCurrentAttemptDetailsHandler to new a RES…
…T handler This closes #5287.
- Loading branch information
1 parent
dc9a4f2
commit de30d16
Showing
8 changed files
with
448 additions
and
127 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
88 changes: 88 additions & 0 deletions
88
...n/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandler.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,88 @@ | ||
| /* | ||
| * 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.handler.job; | ||
|
|
||
| import org.apache.flink.api.common.JobID; | ||
| import org.apache.flink.api.common.time.Time; | ||
| import org.apache.flink.runtime.executiongraph.AccessExecution; | ||
| import org.apache.flink.runtime.executiongraph.AccessExecutionVertex; | ||
| import org.apache.flink.runtime.jobgraph.JobVertexID; | ||
| import org.apache.flink.runtime.rest.handler.HandlerRequest; | ||
| import org.apache.flink.runtime.rest.handler.RestHandlerException; | ||
| import org.apache.flink.runtime.rest.handler.legacy.ExecutionGraphCache; | ||
| import org.apache.flink.runtime.rest.handler.legacy.metrics.MetricFetcher; | ||
| import org.apache.flink.runtime.rest.handler.util.MutableIOMetrics; | ||
| import org.apache.flink.runtime.rest.messages.EmptyRequestBody; | ||
| import org.apache.flink.runtime.rest.messages.JobIDPathParameter; | ||
| import org.apache.flink.runtime.rest.messages.JobVertexIdPathParameter; | ||
| import org.apache.flink.runtime.rest.messages.MessageHeaders; | ||
| import org.apache.flink.runtime.rest.messages.job.SubtaskExecutionAttemptDetailsInfo; | ||
| import org.apache.flink.runtime.rest.messages.job.SubtaskMessageParameters; | ||
| import org.apache.flink.runtime.webmonitor.RestfulGateway; | ||
| import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; | ||
| import org.apache.flink.util.Preconditions; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.Executor; | ||
|
|
||
| /** | ||
| * Request handler providing details about a single task execution attempt. | ||
| */ | ||
| public class SubtaskCurrentAttemptDetailsHandler extends AbstractSubtaskHandler<SubtaskExecutionAttemptDetailsInfo, SubtaskMessageParameters> { | ||
|
|
||
| private final MetricFetcher<?> metricFetcher; | ||
|
|
||
| public SubtaskCurrentAttemptDetailsHandler( | ||
| CompletableFuture<String> localRestAddress, | ||
| GatewayRetriever<? extends RestfulGateway> leaderRetriever, | ||
| Time timeout, | ||
| Map<String, String> responseHeaders, | ||
| MessageHeaders<EmptyRequestBody, SubtaskExecutionAttemptDetailsInfo, SubtaskMessageParameters> messageHeaders, | ||
| ExecutionGraphCache executionGraphCache, | ||
| Executor executor, | ||
| MetricFetcher<?> metricFetcher) { | ||
|
|
||
| super(localRestAddress, leaderRetriever, timeout, responseHeaders, messageHeaders, executionGraphCache, executor); | ||
|
|
||
| this.metricFetcher = Preconditions.checkNotNull(metricFetcher); | ||
| } | ||
|
|
||
| @Override | ||
| protected SubtaskExecutionAttemptDetailsInfo handleRequest( | ||
| HandlerRequest<EmptyRequestBody, SubtaskMessageParameters> request, | ||
| AccessExecutionVertex executionVertex) throws RestHandlerException { | ||
|
|
||
| final AccessExecution execution = executionVertex.getCurrentExecutionAttempt(); | ||
|
|
||
| final MutableIOMetrics ioMetrics = new MutableIOMetrics(); | ||
|
|
||
| final JobID jobID = request.getPathParameter(JobIDPathParameter.class); | ||
| final JobVertexID jobVertexID = request.getPathParameter(JobVertexIdPathParameter.class); | ||
|
|
||
| ioMetrics.addIOMetrics( | ||
| execution, | ||
| metricFetcher, | ||
| jobID.toString(), | ||
| jobVertexID.toString() | ||
| ); | ||
|
|
||
| return SubtaskExecutionAttemptDetailsInfo.create(execution, ioMetrics); | ||
| } | ||
| } |
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
77 changes: 77 additions & 0 deletions
77
.../java/org/apache/flink/runtime/rest/messages/job/SubtaskCurrentAttemptDetailsHeaders.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,77 @@ | ||
| /* | ||
| * 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.job; | ||
|
|
||
| import org.apache.flink.runtime.rest.HttpMethodWrapper; | ||
| import org.apache.flink.runtime.rest.handler.job.SubtaskCurrentAttemptDetailsHandler; | ||
| import org.apache.flink.runtime.rest.messages.EmptyRequestBody; | ||
| import org.apache.flink.runtime.rest.messages.JobIDPathParameter; | ||
| import org.apache.flink.runtime.rest.messages.JobVertexIdPathParameter; | ||
| import org.apache.flink.runtime.rest.messages.MessageHeaders; | ||
| import org.apache.flink.runtime.rest.messages.SubtaskIndexPathParameter; | ||
|
|
||
| import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; | ||
|
|
||
| /** | ||
| * Message headers for the {@link SubtaskCurrentAttemptDetailsHandler}. | ||
| */ | ||
| public class SubtaskCurrentAttemptDetailsHeaders implements MessageHeaders<EmptyRequestBody, SubtaskExecutionAttemptDetailsInfo, SubtaskMessageParameters> { | ||
|
|
||
| private static final SubtaskCurrentAttemptDetailsHeaders INSTANCE = new SubtaskCurrentAttemptDetailsHeaders(); | ||
|
|
||
| public static final String URL = String.format( | ||
| "/jobs/:%s/vertices/:%s/subtasks/:%s", | ||
| JobIDPathParameter.KEY, | ||
| JobVertexIdPathParameter.KEY, | ||
| SubtaskIndexPathParameter.KEY); | ||
|
|
||
| @Override | ||
| public HttpMethodWrapper getHttpMethod() { | ||
| return HttpMethodWrapper.GET; | ||
| } | ||
|
|
||
| @Override | ||
| public String getTargetRestEndpointURL() { | ||
| return URL; | ||
| } | ||
|
|
||
| @Override | ||
| public Class<EmptyRequestBody> getRequestClass() { | ||
| return EmptyRequestBody.class; | ||
| } | ||
|
|
||
| @Override | ||
| public Class<SubtaskExecutionAttemptDetailsInfo> getResponseClass() { | ||
| return SubtaskExecutionAttemptDetailsInfo.class; | ||
| } | ||
|
|
||
| @Override | ||
| public HttpResponseStatus getResponseStatusCode() { | ||
| return HttpResponseStatus.OK; | ||
| } | ||
|
|
||
| @Override | ||
| public SubtaskMessageParameters getUnresolvedMessageParameters() { | ||
| return new SubtaskMessageParameters(); | ||
| } | ||
|
|
||
| public static SubtaskCurrentAttemptDetailsHeaders getInstance() { | ||
| return INSTANCE; | ||
| } | ||
| } |
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
Oops, something went wrong.