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 2017/05/05 11:48:18 UTC
[13/16] flink git commit: [FLINK-6217] Fix
ContaineredTaskManagerParametersTest to properly test off heap settings
[FLINK-6217] Fix ContaineredTaskManagerParametersTest to properly test off heap settings
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b1f18642
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b1f18642
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b1f18642
Branch: refs/heads/master
Commit: b1f186425c3a15de9d7c0f66e3d3d4d3a7e6b259
Parents: 5cf22f4
Author: Till Rohrmann <tr...@apache.org>
Authored: Wed May 3 17:33:01 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri May 5 11:08:10 2017 +0200
----------------------------------------------------------------------
.../ContaineredTaskManagerParametersTest.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b1f18642/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ContaineredTaskManagerParametersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ContaineredTaskManagerParametersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ContaineredTaskManagerParametersTest.java
index c0c48f9..ad11f70 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ContaineredTaskManagerParametersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ContaineredTaskManagerParametersTest.java
@@ -19,30 +19,42 @@
package org.apache.flink.runtime.clusterframework;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.util.TestLogger;
import org.junit.Test;
-import static org.apache.flink.configuration.ConfigConstants.TASK_MANAGER_MEMORY_OFF_HEAP_KEY;
-import static org.apache.flink.configuration.TaskManagerOptions.MANAGED_MEMORY_SIZE;
+import static org.apache.flink.configuration.TaskManagerOptions.MEMORY_OFF_HEAP;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class ContaineredTaskManagerParametersTest {
- private static final long CONTAINER_MEMORY = 8192;
+public class ContaineredTaskManagerParametersTest extends TestLogger {
+ private static final long CONTAINER_MEMORY = 8192L;
+ /**
+ * This tests that per default the off heap memory is set to -1.
+ */
@Test
- public void testDefaultOffHeapMemory() {
+ public void testOffHeapMemoryWithDefaultConfiguration() {
Configuration conf = new Configuration();
+
ContaineredTaskManagerParameters params =
ContaineredTaskManagerParameters.create(conf, CONTAINER_MEMORY, 1);
- assertEquals(-1, params.taskManagerDirectMemoryLimitMB());
+ assertEquals(-1L, params.taskManagerDirectMemoryLimitMB());
}
+ /**
+ * This tests that when using off heap memory the sum of on and off heap memory does not exceeds the container
+ * maximum.
+ */
@Test
public void testTotalMemoryDoesNotExceedContainerMemory() {
Configuration conf = new Configuration();
- conf.setBoolean(MANAGED_MEMORY_SIZE.key(), true);
+ conf.setBoolean(MEMORY_OFF_HEAP, true);
+
ContaineredTaskManagerParameters params =
ContaineredTaskManagerParameters.create(conf, CONTAINER_MEMORY, 1);
+
+ assertTrue(params.taskManagerDirectMemoryLimitMB() > 0L);
+
assertTrue(params.taskManagerHeapSizeMB() +
params.taskManagerDirectMemoryLimitMB() <= CONTAINER_MEMORY);
}