From a5cf88f7ff1fcd46bada0cf12c517c1667b21751 Mon Sep 17 00:00:00 2001 From: Roman Maier Date: Fri, 18 Nov 2016 17:51:58 +0400 Subject: [PATCH] [FLINK-5002] [network] Renamed getNumberOfUsedBuffers() method to bestEffortGetNumOfUsedBuffers() This closes #2865 --- .../apache/flink/runtime/io/network/buffer/BufferPool.java | 2 +- .../flink/runtime/io/network/buffer/LocalBufferPool.java | 4 ++-- .../flink/runtime/metrics/groups/TaskIOMetricGroup.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/BufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/BufferPool.java index ae21a843cb924..8784b14ae7f68 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/BufferPool.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/BufferPool.java @@ -71,6 +71,6 @@ public interface BufferPool extends BufferProvider, BufferRecycler { /** * Returns the number of used buffers of this buffer pool. */ - int getNumberOfUsedBuffers(); + int bestEffortGetNumOfUsedBuffers(); } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java index 68c1bdea72e24..86e68704897d8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java @@ -111,8 +111,8 @@ public int getNumBuffers() { } @Override - public int getNumberOfUsedBuffers() { - return numberOfRequestedMemorySegments - availableMemorySegments.size(); + public int bestEffortGetNumOfUsedBuffers() { + return Math.max(0, numberOfRequestedMemorySegments - availableMemorySegments.size()); } @Override diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java index fcea098a3dbab..38accad9bee73 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java @@ -183,7 +183,7 @@ public Float getValue() { int bufferPoolSize = 0; for (SingleInputGate inputGate : task.getAllInputGates()) { - usedBuffers += inputGate.getBufferPool().getNumberOfUsedBuffers(); + usedBuffers += inputGate.getBufferPool().bestEffortGetNumOfUsedBuffers(); bufferPoolSize += inputGate.getBufferPool().getNumBuffers(); } @@ -212,7 +212,7 @@ public Float getValue() { int bufferPoolSize = 0; for (ResultPartition resultPartition : task.getProducedPartitions()) { - usedBuffers += resultPartition.getBufferPool().getNumberOfUsedBuffers(); + usedBuffers += resultPartition.getBufferPool().bestEffortGetNumOfUsedBuffers(); bufferPoolSize += resultPartition.getBufferPool().getNumBuffers(); }