You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2019/12/17 08:41:48 UTC
[flink] branch master updated: [FLINK-15286][state-backend-rocksdb]
Read option whether to use managed memory from configuration
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 685c443 [FLINK-15286][state-backend-rocksdb] Read option whether to use managed memory from configuration
685c443 is described below
commit 685c443a7230dc914f83e793ead83ccd0e46e773
Author: Stephan Ewen <se...@apache.org>
AuthorDate: Mon Dec 16 21:53:25 2019 +0100
[FLINK-15286][state-backend-rocksdb] Read option whether to use managed memory from configuration
This closes #10600
---
.../contrib/streaming/state/RocksDBMemoryConfiguration.java | 4 ++++
.../streaming/state/RocksDBStateBackendConfigTest.java | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBMemoryConfiguration.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBMemoryConfiguration.java
index f3f9442..9e7ac0a 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBMemoryConfiguration.java
+++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBMemoryConfiguration.java
@@ -181,6 +181,10 @@ public final class RocksDBMemoryConfiguration implements Serializable {
final RocksDBMemoryConfiguration newConfig = new RocksDBMemoryConfiguration();
+ newConfig.useManagedMemory = other.useManagedMemory != null
+ ? other.useManagedMemory
+ : config.getBoolean(RocksDBOptions.USE_MANAGED_MEMORY);
+
newConfig.fixedMemoryPerSlot = other.fixedMemoryPerSlot != null
? other.fixedMemoryPerSlot
: config.get(RocksDBOptions.FIX_PER_SLOT_MEMORY_SIZE);
diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java
index 197c63b..d7980dc 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java
+++ b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java
@@ -625,6 +625,7 @@ public class RocksDBStateBackendConfigTest {
@Test
public void testDefaultMemoryControlParameters() {
RocksDBMemoryConfiguration memSettings = new RocksDBMemoryConfiguration();
+ assertFalse(memSettings.isUsingManagedMemory());
assertFalse(memSettings.isUsingFixedMemoryPerSlot());
assertEquals(RocksDBOptions.HIGH_PRIORITY_POOL_RATIO.defaultValue(), memSettings.getHighPriorityPoolRatio(), 0.0);
assertEquals(RocksDBOptions.WRITE_BUFFER_RATIO.defaultValue(), memSettings.getWriteBufferRatio(), 0.0);
@@ -636,6 +637,17 @@ public class RocksDBStateBackendConfigTest {
}
@Test
+ public void testConfigureManagedMemory() {
+ final Configuration config = new Configuration();
+ config.setBoolean(RocksDBOptions.USE_MANAGED_MEMORY, true);
+
+ final RocksDBMemoryConfiguration memSettings = RocksDBMemoryConfiguration.fromOtherAndConfiguration(
+ new RocksDBMemoryConfiguration(), config);
+
+ assertTrue(memSettings.isUsingManagedMemory());
+ }
+
+ @Test
public void testConfigureIllegalMemoryControlParameters() {
RocksDBMemoryConfiguration memSettings = new RocksDBMemoryConfiguration();