tillrohrmann commented on a change in pull request #10716:
[FLINK-15367][runtime] Handle backwards compatibility of
"taskmanager.heap.size" differently for standalone / active setups
URL: https://github.com/apache/flink/pull/10716#discussion_r362779912
##########
File path:
flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/TaskExecutorResourceUtils.java
##########
@@ -688,4 +669,55 @@ public static Configuration
adjustConfigurationForLocalExecution(final Configura
return modifiedConfig;
}
+
+ public static Configuration
adjustConfigurationForStandaloneSetups(final Configuration configuration) {
+ return
getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
+ configuration, TaskManagerOptions.TOTAL_FLINK_MEMORY);
+ }
+
+ public static Configuration
adjustConfigurationForContainerizedSetups(final Configuration configuration) {
+ return
getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
+ configuration, TaskManagerOptions.TOTAL_PROCESS_MEMORY);
+ }
+
+ private static Configuration
getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
+ final Configuration configuration, ConfigOption<MemorySize>
configOption) {
+
+ final Optional<MemorySize> legacyHeapSizeOptional =
getLegacyTaskManagerHeapMemoryIfExplicitlyConfigured(configuration);
+ if (legacyHeapSizeOptional.isPresent()) {
+ final Configuration copiedConfig = new
Configuration(configuration);
+ copiedConfig.set(configOption,
legacyHeapSizeOptional.get());
+ return copiedConfig;
+ }
+
+ return configuration;
Review comment:
This could be expressed slightly more succinct:
```
getLegacyTaskManagerHeapMemoryIfExplicitlyConfigured(null).map(legacyHeapSize
-> {
final Configuration copiedConfiguration = new
Configuration(configuration);
copiedConfiguration.set(configOption, legacyHeapSize);
return copiedConfiguration;
}).orElse(configuration);
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
