This is an automated email from the ASF dual-hosted git repository.

azagrebin pushed a commit to branch flip116
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 0f1bbee21ed6ccd0ace193ec27adf8e212ee35c5
Author: Andrey Zagrebin <azagre...@apache.org>
AuthorDate: Wed Apr 15 13:16:29 2020 +0300

    [hotfix] Remove 'TaskManager' from 
MemoryBackwardsCompatibilityUtils#getLegacyTaskManagerHeapMemoryIfExplicitlyConfigured
---
 .../runtime/util/config/memory/MemoryBackwardsCompatibilityUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/MemoryBackwardsCompatibilityUtils.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/MemoryBackwardsCompatibilityUtils.java
index f334922..80c7af3 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/MemoryBackwardsCompatibilityUtils.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/MemoryBackwardsCompatibilityUtils.java
@@ -49,7 +49,7 @@ public class MemoryBackwardsCompatibilityUtils {
                if (configuration.contains(configOption)) {
                        return configuration;
                }
-               return 
getLegacyTaskManagerHeapMemoryIfExplicitlyConfigured(configuration)
+               return getLegacyHeapMemoryIfExplicitlyConfigured(configuration)
                        .map(legacyHeapSize -> {
                                Configuration copiedConfig = new 
Configuration(configuration);
                                copiedConfig.set(configOption, legacyHeapSize);
@@ -61,7 +61,7 @@ public class MemoryBackwardsCompatibilityUtils {
                        }).orElse(configuration);
        }
 
-       private Optional<MemorySize> 
getLegacyTaskManagerHeapMemoryIfExplicitlyConfigured(Configuration 
configuration) {
+       private Optional<MemorySize> 
getLegacyHeapMemoryIfExplicitlyConfigured(Configuration configuration) {
                @SuppressWarnings("CallToSystemGetenv")
                String totalProcessEnv = 
System.getenv(legacyMemoryOptions.getEnvVar());
                if (totalProcessEnv != null) {

Reply via email to