[FLINK-5002] [network] Renamed getNumberOfUsedBuffers() method to bes…

…tEffortGetNumOfUsedBuffers() This closes apache#2865
fullcontact · Dec 14, 2016 · a5cf88f · a5cf88f
1 parent 22a8204
commit a5cf88f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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();
  }