Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E0570200BDC for ; Wed, 14 Dec 2016 13:10:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DF186160B33; Wed, 14 Dec 2016 12:10:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0BB1F160B37 for ; Wed, 14 Dec 2016 13:10:09 +0100 (CET) Received: (qmail 70680 invoked by uid 500); 14 Dec 2016 12:10:09 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 70307 invoked by uid 99); 14 Dec 2016 12:10:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2016 12:10:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9018FE3813; Wed, 14 Dec 2016 12:10:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.apache.org Date: Wed, 14 Dec 2016 12:10:14 -0000 Message-Id: In-Reply-To: <9135ed50ed924571b3e16e7186f5ae40@git.apache.org> References: <9135ed50ed924571b3e16e7186f5ae40@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/12] flink git commit: [FLINK-5002] [network] Renamed getNumberOfUsedBuffers() method to bestEffortGetNumOfUsedBuffers() archived-at: Wed, 14 Dec 2016 12:10:11 -0000 [FLINK-5002] [network] Renamed getNumberOfUsedBuffers() method to bestEffortGetNumOfUsedBuffers() This closes #2865 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a5cf88f7 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a5cf88f7 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a5cf88f7 Branch: refs/heads/master Commit: a5cf88f7ff1fcd46bada0cf12c517c1667b21751 Parents: 22a8204 Author: Roman Maier Authored: Fri Nov 18 17:51:58 2016 +0400 Committer: Stephan Ewen Committed: Wed Dec 14 12:43:33 2016 +0100 ---------------------------------------------------------------------- .../org/apache/flink/runtime/io/network/buffer/BufferPool.java | 2 +- .../apache/flink/runtime/io/network/buffer/LocalBufferPool.java | 4 ++-- .../apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a5cf88f7/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/BufferPool.java ---------------------------------------------------------------------- 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 ae21a84..8784b14 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(); } http://git-wip-us.apache.org/repos/asf/flink/blob/a5cf88f7/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java ---------------------------------------------------------------------- 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 68c1bde..86e6870 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 @@ class LocalBufferPool implements BufferPool { } @Override - public int getNumberOfUsedBuffers() { - return numberOfRequestedMemorySegments - availableMemorySegments.size(); + public int bestEffortGetNumOfUsedBuffers() { + return Math.max(0, numberOfRequestedMemorySegments - availableMemorySegments.size()); } @Override http://git-wip-us.apache.org/repos/asf/flink/blob/a5cf88f7/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java ---------------------------------------------------------------------- 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 fcea098..38accad 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 class TaskIOMetricGroup extends ProxyMetricGroup { 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 class TaskIOMetricGroup extends ProxyMetricGroup { int bufferPoolSize = 0; for (ResultPartition resultPartition : task.getProducedPartitions()) { - usedBuffers += resultPartition.getBufferPool().getNumberOfUsedBuffers(); + usedBuffers += resultPartition.getBufferPool().bestEffortGetNumOfUsedBuffers(); bufferPoolSize += resultPartition.getBufferPool().getNumBuffers(); }