From 3dcff75aa37685b69bc44749bfdbfa112fe653e7 Mon Sep 17 00:00:00 2001 From: Zhang Changjun <479224070@qq.com> Date: Mon, 9 Jan 2023 19:08:39 +0800 Subject: [PATCH] Update YarnPerJobClusterClientHelper.java [Bug- #1473 ][chunjun-clients] fix Logic error in confProp parameter processing --- .../yarn/YarnPerJobClusterClientHelper.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnPerJobClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnPerJobClusterClientHelper.java index f2e96e0c3d..f44a2524d9 100644 --- a/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnPerJobClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnPerJobClusterClientHelper.java @@ -29,6 +29,7 @@ import org.apache.flink.client.program.ClusterClientProvider; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.JobManagerOptions; +import org.apache.flink.configuration.MemorySize; import org.apache.flink.configuration.TaskManagerOptions; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings; @@ -182,20 +183,21 @@ private ClusterSpecification createClusterSpecification(JobDeployer jobDeployer) jobManagerMemoryMb = Math.max( MIN_JM_MEMORY, - ValueUtil.getInt( - conProp.getProperty( - JobManagerOptions.TOTAL_PROCESS_MEMORY.key()))); - jobManagerMemoryMb = jobManagerMemoryMb >> 20; + MemorySize.parse( + conProp.getProperty( + JobManagerOptions.TOTAL_PROCESS_MEMORY + .key())) + .getMebiBytes()); } if (conProp.containsKey(TaskManagerOptions.TOTAL_PROCESS_MEMORY.key())) { taskManagerMemoryMb = Math.max( MIN_TM_MEMORY, - ValueUtil.getInt( - conProp.getProperty( - TaskManagerOptions.TOTAL_PROCESS_MEMORY.key()))); - - taskManagerMemoryMb = taskManagerMemoryMb >> 20; + MemorySize.parse( + conProp.getProperty( + TaskManagerOptions.TOTAL_PROCESS_MEMORY + .key())) + .getMebiBytes()); } if (conProp.containsKey(NUM_TASK_SLOTS.key())) { slotsPerTaskManager = ValueUtil.getInt(conProp.get(NUM_TASK_SLOTS.key()));