You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by xt...@apache.org on 2021/02/19 01:10:19 UTC
[flink] 02/04: [hotfix][runtime] No need to delete TM resource id
from active RM configuration.
This is an automated email from the ASF dual-hosted git repository.
xtsong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit b87d744a283f4ebf2898cc3c62804004f6bcc6f4
Author: Xintong Song <to...@gmail.com>
AuthorDate: Thu Feb 18 11:23:49 2021 +0800
[hotfix][runtime] No need to delete TM resource id from active RM configuration.
The active resource manager drivers will overwrite the resource ids anyway before starting TMs.
---
.../resourcemanager/active/ActiveResourceManagerFactory.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerFactory.java
index 10ceb4e..e95652c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerFactory.java
@@ -78,13 +78,9 @@ public abstract class ActiveResourceManagerFactory<WorkerType extends ResourceID
ioExecutor);
}
- private Configuration createActiveResourceManagerConfiguration(
- Configuration originalConfiguration) {
- final Configuration copiedConfig = new Configuration(originalConfiguration);
- // In active mode, it depends on the ResourceManager to set the ResourceID of TaskManagers.
- copiedConfig.removeConfig(TaskManagerOptions.TASK_MANAGER_RESOURCE_ID);
+ private Configuration createActiveResourceManagerConfiguration(Configuration configuration) {
return TaskExecutorProcessUtils.getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
- copiedConfig, TaskManagerOptions.TOTAL_PROCESS_MEMORY);
+ configuration, TaskManagerOptions.TOTAL_PROCESS_MEMORY);
}
@Override