zhijiangW commented on a change in pull request #8455: [FLINK-12284][Network,Metrics]Fix the incorrect inputBufferUsage metric in credit-based network mode URL: https://github.com/apache/flink/pull/8455#discussion_r288852438
########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/io/network/metrics/CreditBasedInputBufferPoolMetric.java ########## @@ -0,0 +1,136 @@ +/* + * 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.io.network.metrics; + +import org.apache.flink.metrics.Gauge; +import org.apache.flink.runtime.io.network.partition.consumer.InputChannel; +import org.apache.flink.runtime.io.network.partition.consumer.RemoteInputChannel; +import org.apache.flink.runtime.io.network.partition.consumer.SingleInputGate; + +/** + * Gauge metric measuring the input buffer pool usage gauge for {@link SingleInputGate}s under credit based mode. + */ +public class CreditBasedInputBufferPoolMetric { + + /** + * Gauge metric measuring the floating buffer usage for {@link SingleInputGate}. + */ + public static class FloatingBufferPoolUsage implements Gauge<Float> { + + public SingleInputGate[] inputGates; + + public FloatingBufferPoolUsage(SingleInputGate[] inputGates) { + this.inputGates = inputGates; + } + + @Override + public Float getValue() { + int leftFloatingBuffer = 0; + int requestedFloatingBuffer = 0; + + for (SingleInputGate inputGate : inputGates) { + requestedFloatingBuffer += inputGate.getBufferPool().bestEffortGetNumOfUsedBuffers(); + for (InputChannel ic : inputGate.getInputChannels().values()) { + if (ic instanceof RemoteInputChannel) { + leftFloatingBuffer += ((RemoteInputChannel) ic).unsafeGetFloatingBufferLeft(); + } + } + } + + if (requestedFloatingBuffer == 0) { + return 0.0f; + } else { + return 1 - ((float) leftFloatingBuffer) / requestedFloatingBuffer; + } + } + } + + /** + * Gauge metric measuring the exclusive buffer usage for {@link SingleInputGate}. + */ + public static class ExclusiveBufferPoolUsage implements Gauge<Float> { + + public SingleInputGate[] inputGates; + + public ExclusiveBufferPoolUsage(SingleInputGate[] inputGates) { + this.inputGates = inputGates; + } + + @Override + public Float getValue() { + int usedExclusiveBuffer = 0; + int requestedExclusiveBuffer = 0; + + for (SingleInputGate inputGate : inputGates) { + for (InputChannel ic : inputGate.getInputChannels().values()) { + if (ic instanceof RemoteInputChannel) { + requestedExclusiveBuffer += ((RemoteInputChannel) ic).getInitialCredit(); + usedExclusiveBuffer += ((RemoteInputChannel) ic).unsafeGetExclusiveBufferUsed(); + } + } + } + + if (requestedExclusiveBuffer != 0) { + return ((float) usedExclusiveBuffer) / requestedExclusiveBuffer; + } else { + return 0.0f; + } + } + } + + /** + * Gauge metric measuring the overall buffer usage for {@link SingleInputGate} under credit based mode. + */ + public static class InputBufferPoolUsageGauge implements Gauge<Float> { + + public SingleInputGate[] inputGates; + + public InputBufferPoolUsageGauge(SingleInputGate[] inputGates) { + this.inputGates = inputGates; + } + + @Override + public Float getValue() { Review comment: We might extract the logics of above `exclusiveBuffersUsage and `floatingBuffersUsage into separate methods, then these methods could be reused here to get final results directly, to avoid below detail logics again. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
