Skip to content

Commit 80d3127

Browse files
committed
parse flinkconfig
1 parent 37fb07a commit 80d3127

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

launcher/src/main/java/com/dtstack/flink/sql/launcher/factory/AbstractClusterClientFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ClusterSpecification getClusterSpecification(Configuration configuration)
4141
final int jobManagerMemoryMB = ConfigurationUtils
4242
.getJobManagerHeapMemory(configuration)
4343
.getMebiBytes();
44-
// taskmanager.memory.process.size
44+
4545
final int taskManagerMemoryMB = TaskExecutorProcessUtils
4646
.processSpecFromConfig(TaskExecutorProcessUtils.getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
4747
configuration, TaskManagerOptions.TOTAL_PROCESS_MEMORY))

launcher/src/main/java/com/dtstack/flink/sql/launcher/utils/JobGraphBuildUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ protected static SavepointRestoreSettings dealSavepointRestoreSettings(Propertie
8888
}
8989

9090
public static Configuration getFlinkConfiguration(String flinkConfDir, Properties confProperties) {
91-
Configuration flinkConfig = StringUtils.isEmpty(flinkConfDir) ? new Configuration() :
92-
GlobalConfiguration.loadConfiguration();
91+
Configuration flinkConfig = StringUtils.isEmpty(flinkConfDir) ? new Configuration() : GlobalConfiguration.loadConfiguration(flinkConfDir);
9392

9493
confProperties.forEach((key, val) -> flinkConfig.setString(key.toString(), val.toString()));
9594
return flinkConfig;

0 commit comments

Comments
 (0)