[hotfix][runtime] Code clean-ups in BashJavaUtils and its test cases.

bbejeck · Apr 27, 2020 · 3baa833 · 3baa833
1 parent af1d21f
commit 3baa833
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -41,7 +41,7 @@ public static void main(String[] args) throws Exception {
 
  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 @@ private static void getTmResourceParams(String[] args) throws Exception {
  }
 
  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);
  }