You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/07/04 09:56:35 UTC
[1/2] flink git commit: [hotfix] Use currentPoolSize in releaseMemory
expression instead of numBuffers
Repository: flink
Updated Branches:
refs/heads/master afdbf5471 -> 579807d70
[hotfix] Use currentPoolSize in releaseMemory expression instead of numBuffers
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/579807d7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/579807d7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/579807d7
Branch: refs/heads/master
Commit: 579807d700141025123dfc01668a055e5adcf210
Parents: 1b20090
Author: Till Rohrmann <tr...@apache.org>
Authored: Tue Jul 3 16:04:25 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Jul 4 11:56:20 2018 +0200
----------------------------------------------------------------------
.../apache/flink/runtime/io/network/buffer/LocalBufferPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/579807d7/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 7d9aa21..6f0d991 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
@@ -336,7 +336,7 @@ class LocalBufferPool implements BufferPool {
// If there is a registered owner and we have still requested more buffers than our
// size, trigger a recycle via the owner.
if (owner != null && numberOfRequestedMemorySegments > currentPoolSize) {
- owner.releaseMemory(numberOfRequestedMemorySegments - numBuffers);
+ owner.releaseMemory(numberOfRequestedMemorySegments - currentPoolSize);
}
}
}
[2/2] flink git commit: [hotfix] Let LocalBufferPoolTest extend
TestLogger
Posted by tr...@apache.org.
[hotfix] Let LocalBufferPoolTest extend TestLogger
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1b20090f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1b20090f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1b20090f
Branch: refs/heads/master
Commit: 1b20090f93eb61b61ced91b93ce56d86c0537600
Parents: afdbf547
Author: Till Rohrmann <tr...@apache.org>
Authored: Tue Jul 3 15:51:34 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Jul 4 11:56:20 2018 +0200
----------------------------------------------------------------------
.../flink/runtime/io/network/buffer/LocalBufferPoolTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1b20090f/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolTest.java
index b04286e..303a6a9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolTest.java
@@ -18,6 +18,8 @@
package org.apache.flink.runtime.io.network.buffer;
+import org.apache.flink.util.TestLogger;
+
import org.apache.flink.shaded.guava18.com.google.common.collect.Lists;
import org.junit.After;
@@ -47,7 +49,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.powermock.api.mockito.PowerMockito.spy;
-public class LocalBufferPoolTest {
+public class LocalBufferPoolTest extends TestLogger {
private final static int numBuffers = 1024;