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/15 16:52:58 UTC

[flink] 01/12: [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 d22f6d85f4be31415fcf5cb76ee8514bce4c0039
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/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java      | 4 ++--
 .../src/main/java/org/apache/flink/runtime/util/BashJavaUtils.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh b/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh
index 2a7f883..a69610d 100755
--- a/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh
+++ b/flink-dist/src/test/bin/runBashJavaUtilsCmd.sh
@@ -36,6 +36,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}" | tail -n 2)
+output=$(runBashJavaUtilsCmd ${COMMAND} ${FLINK_CONF_DIR} "$FLINK_TARGET_DIR/bash-java-utils.jar:$FLINK_DIST_JAR}" | tail -n 2)
 extractExecutionParams "$(echo "$output" | head -n 1)"
 extractExecutionParams "$(echo "$output" | tail -n 1)"
diff --git a/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java b/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java
index 1281ed2..875ef21 100644
--- a/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java
+++ b/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java
@@ -43,7 +43,7 @@ public class BashJavaUtilsITCase extends JavaBashTestBase {
 		List<String> lines = Arrays.asList(executeScript(commands).split(System.lineSeparator()));
 
 		assertEquals(2, lines.size());
-		ConfigurationUtils.parseJvmArgString(lines.get(lines.size() - 2));
-		ConfigurationUtils.parseTmResourceDynamicConfigs(lines.get(lines.size() - 1));
+		ConfigurationUtils.parseJvmArgString(lines.get(0));
+		ConfigurationUtils.parseTmResourceDynamicConfigs(lines.get(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);
 	}