-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-12201][network,metrics] Introduce InputGateWithMetrics in Task…
… to increment numBytesIn metric Incrementing of numBytesIn metric in SingleInputGate does not depend on shuffle service and can be moved out of network internals into Task. Task could wrap InputGate provided by ShuffleService with InputGateWithMetrics which would increment numBytesIn metric.
- Loading branch information
Showing
11 changed files
with
158 additions
and
49 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
106 changes: 106 additions & 0 deletions
106
flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/InputGateWithMetrics.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,106 @@ | ||
| /* | ||
| * 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.taskmanager; | ||
|
|
||
| import org.apache.flink.metrics.Counter; | ||
| import org.apache.flink.runtime.event.TaskEvent; | ||
| import org.apache.flink.runtime.io.network.partition.consumer.BufferOrEvent; | ||
| import org.apache.flink.runtime.io.network.partition.consumer.InputGate; | ||
| import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| import static org.apache.flink.util.Preconditions.checkNotNull; | ||
|
|
||
| /** | ||
| * This class wraps {@link InputGate} provided by shuffle service and it is mainly | ||
| * used for increasing general input metrics from {@link TaskIOMetricGroup}. | ||
| */ | ||
| public class InputGateWithMetrics extends InputGate { | ||
|
|
||
| private final InputGate inputGate; | ||
|
|
||
| private final Counter numBytesIn; | ||
|
|
||
| public InputGateWithMetrics(InputGate inputGate, Counter numBytesIn) { | ||
| this.inputGate = checkNotNull(inputGate); | ||
| this.numBytesIn = checkNotNull(numBytesIn); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<?> isAvailable() { | ||
| return inputGate.isAvailable(); | ||
| } | ||
|
|
||
| @Override | ||
| public int getNumberOfInputChannels() { | ||
| return inputGate.getNumberOfInputChannels(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getOwningTaskName() { | ||
| return inputGate.getOwningTaskName(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isFinished() { | ||
| return inputGate.isFinished(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setup() throws IOException { | ||
| inputGate.setup(); | ||
| } | ||
|
|
||
| @Override | ||
| public void requestPartitions() throws IOException, InterruptedException { | ||
| inputGate.requestPartitions(); | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<BufferOrEvent> getNextBufferOrEvent() throws IOException, InterruptedException { | ||
| Optional<BufferOrEvent> bufferOrEvent = inputGate.getNextBufferOrEvent(); | ||
| bufferOrEvent.ifPresent(b -> numBytesIn.inc(b.getSize())); | ||
| return bufferOrEvent; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<BufferOrEvent> pollNextBufferOrEvent() throws IOException, InterruptedException { | ||
| Optional<BufferOrEvent> bufferOrEvent = inputGate.pollNextBufferOrEvent(); | ||
| bufferOrEvent.ifPresent(b -> numBytesIn.inc(b.getSize())); | ||
| return bufferOrEvent; | ||
| } | ||
|
|
||
| @Override | ||
| public void sendTaskEvent(TaskEvent event) throws IOException { | ||
| inputGate.sendTaskEvent(event); | ||
| } | ||
|
|
||
| @Override | ||
| public int getPageSize() { | ||
| return inputGate.getPageSize(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws Exception { | ||
| inputGate.close(); | ||
| } | ||
| } |
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
Oops, something went wrong.