You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by az...@apache.org on 2020/04/20 09:41:27 UTC
[flink] 03/17: [hotfix][runtime] Code clean-ups in BashJavaUtils
and its test cases.
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 6ee9c4a6fc3b5dc7185d6b5a3169b4e62a8c0ab2
Author: Xintong Song <to...@gmail.com>
AuthorDate: Thu Mar 26 13:00:53 2020 +0800
[hotfix][runtime] Code clean-ups in BashJavaUtils and its test cases.
---
flink-dist/src/test/bin/runBashJavaUtilsCmd.sh | 2 +-
.../src/main/java/org/apache/flink/runtime/util/BashJavaUtils.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh b/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh
index e7b79ec..475d463 100755
--- a/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh
+++ b/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh
@@ -38,6 +38,6 @@ FLINK_DIST_JAR=`find $FLINK_TARGET_DIR -name 'flink-dist*.jar'`
. ${bin}/../../main/flink-bin/bin/config.sh > /dev/null
-output=$(runBashJavaUtilsCmd GET_TM_RESOURCE_PARAMS ${FLINK_CONF_DIR} "$FLINK_TARGET_DIR/bash-java-utils.jar:$FLINK_DIST_JAR}" $DYNAMIC_OPTS | tail -n 2)
+output=$(runBashJavaUtilsCmd ${COMMAND} ${FLINK_CONF_DIR} "$FLINK_TARGET_DIR/bash-java-utils.jar:$FLINK_DIST_JAR}" $DYNAMIC_OPTS | tail -n 2)
extractExecutionParams "$(echo "$output" | head -n 1)"
extractExecutionParams "$(echo "$output" | tail -n 1)"
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/BashJavaUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/BashJavaUtils.java
index 27b3c50..14d24f5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/BashJavaUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/BashJavaUtils.java
@@ -41,7 +41,7 @@ public class BashJavaUtils {
switch (Command.valueOf(args[0])) {
case GET_TM_RESOURCE_PARAMS:
- getTmResourceParams(args);
+ getTmResourceParams(Arrays.copyOfRange(args, 1, args.length));
break;
default:
// unexpected, Command#valueOf should fail if a unknown command is passed in
@@ -61,7 +61,7 @@ public class BashJavaUtils {
}
private static Configuration getConfigurationForStandaloneTaskManagers(String[] args) throws Exception {
- Configuration configuration = TaskManagerRunner.loadConfiguration(Arrays.copyOfRange(args, 1, args.length));
+ Configuration configuration = TaskManagerRunner.loadConfiguration(args);
return TaskExecutorProcessUtils.getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
configuration, TaskManagerOptions.TOTAL_FLINK_MEMORY);
}