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 2019/11/07 21:55:53 UTC
[flink] 02/21: [hotfix] Remove heading/trailing/duplicated
whitespaces from shell command generated by BootstrapTools.
This is an automated email from the ASF dual-hosted git repository.
azagrebin pushed a commit to branch FLINK-13986-flip49-cleanup-e2e
in repository https://gitbox.apache.org/repos/asf/flink.git
commit dd728794937d69b710accea513e4662c9e669949
Author: Xintong Song <to...@gmail.com>
AuthorDate: Fri Sep 27 18:09:58 2019 +0800
[hotfix] Remove heading/trailing/duplicated whitespaces from shell command generated by BootstrapTools.
This is to eliminate the dependencies on white space counts from 'BootstrapToolsTest#testGetTaskManagerShellCommand'.
---
.../runtime/clusterframework/BootstrapTools.java | 4 +-
.../clusterframework/BootstrapToolsTest.java | 20 ++++-----
.../flink/yarn/YarnClusterDescriptorTest.java | 49 +++++++++++-----------
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java
index 75de581..0b156ca 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java
@@ -472,7 +472,9 @@ public class BootstrapTools {
for (Map.Entry<String, String> variable : startCommandValues
.entrySet()) {
template = template
- .replace("%" + variable.getKey() + "%", variable.getValue());
+ .replace("%" + variable.getKey() + "%", variable.getValue())
+ .replace(" ", " ")
+ .trim();
}
return template;
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java
index 54aadf5..04ad29c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java
@@ -165,8 +165,8 @@ public class BootstrapToolsTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
- " " + // logging
+ "" + // jvmOpts
+ "" + // logging
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
.getTaskManagerShellCommand(cfg, containeredParams, "./conf", "./logs",
@@ -175,8 +175,8 @@ public class BootstrapToolsTest extends TestLogger {
final String krb5 = "-Djava.security.krb5.conf=krb5.conf";
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
- " " + // logging
+ " " + krb5 + // jvmOpts
+ "" + // logging
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
.getTaskManagerShellCommand(cfg, containeredParams, "./conf", "./logs",
@@ -185,7 +185,7 @@ public class BootstrapToolsTest extends TestLogger {
// logback only, with/out krb5
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
+ "" + // jvmOpts
" " + logfile + " " + logback +
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
@@ -194,7 +194,7 @@ public class BootstrapToolsTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
+ " " + krb5 + // jvmOpts
" " + logfile + " " + logback +
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
@@ -204,7 +204,7 @@ public class BootstrapToolsTest extends TestLogger {
// log4j, with/out krb5
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
+ "" + // jvmOpts
" " + logfile + " " + log4j +
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
@@ -213,7 +213,7 @@ public class BootstrapToolsTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
+ " " + krb5 + // jvmOpts
" " + logfile + " " + log4j +
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
@@ -223,7 +223,7 @@ public class BootstrapToolsTest extends TestLogger {
// logback + log4j, with/out krb5
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
+ "" + // jvmOpts
" " + logfile + " " + logback + " " + log4j +
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
@@ -232,7 +232,7 @@ public class BootstrapToolsTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
+ " " + krb5 + // jvmOpts
" " + logfile + " " + logback + " " + log4j +
" " + mainClass + " " + args + " " + redirects,
BootstrapTools
diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
index 69af7c3..ade7eec 100644
--- a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
+++ b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
@@ -189,7 +189,6 @@ public class YarnClusterDescriptorTest extends TestLogger {
final String log4j =
"-Dlog4j.configuration=file:" + FlinkYarnSessionCli.CONFIG_FILE_LOG4J_NAME; // if set
final String mainClass = clusterDescriptor.getYarnSessionClusterEntrypoint();
- final String args = "";
final String redirects =
"1> " + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/jobmanager.out " +
"2> " + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/jobmanager.err";
@@ -199,9 +198,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
// no logging, with/out krb5
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
- " " + // logging
- " " + mainClass + " " + args + " " + redirects,
+ "" + // jvmOpts
+ "" + // logging
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -213,9 +212,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
- " " + // logging
- " " + mainClass + " " + args + " " + redirects,
+ " " + krb5 + // jvmOpts
+ "" + // logging
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -228,9 +227,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
// logback only, with/out krb5
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
+ "" + // jvmOpts
" " + logfile + " " + logback +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -242,9 +241,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
+ " " + krb5 + // jvmOpts
" " + logfile + " " + logback +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -257,9 +256,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
// log4j, with/out krb5
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
+ "" + // jvmOpts
" " + logfile + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -271,9 +270,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
+ " " + krb5 + // jvmOpts
" " + logfile + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -286,9 +285,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
// logback + log4j, with/out krb5
assertEquals(
java + " " + jvmmem +
- " " + // jvmOpts
+ "" + // jvmOpts
" " + logfile + " " + logback + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -300,9 +299,9 @@ public class YarnClusterDescriptorTest extends TestLogger {
assertEquals(
java + " " + jvmmem +
- " " + " " + krb5 + // jvmOpts
+ " " + krb5 + // jvmOpts
" " + logfile + " " + logback + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -320,7 +319,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
java + " " + jvmmem +
" " + jvmOpts +
" " + logfile + " " + logback + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -334,7 +333,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
java + " " + jvmmem +
" " + jvmOpts + " " + krb5 + // jvmOpts
" " + logfile + " " + logback + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -351,7 +350,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
java + " " + jvmmem +
" " + jvmOpts + " " + jmJvmOpts +
" " + logfile + " " + logback + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -365,7 +364,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
java + " " + jvmmem +
" " + jvmOpts + " " + jmJvmOpts + " " + krb5 + // jvmOpts
" " + logfile + " " + logback + " " + log4j +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -383,7 +382,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
java + " 1 " + jvmmem +
" 2 " + jvmOpts + " " + jmJvmOpts + " " + krb5 + // jvmOpts
" 3 " + logfile + " " + logback + " " + log4j +
- " 4 " + mainClass + " 5 " + args + " 6 " + redirects,
+ " 4 " + mainClass + " 5 6 " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,
@@ -401,7 +400,7 @@ public class YarnClusterDescriptorTest extends TestLogger {
" " + logfile + " " + logback + " " + log4j +
" " + jvmOpts + " " + jmJvmOpts + " " + krb5 + // jvmOpts
" " + jvmmem +
- " " + mainClass + " " + args + " " + redirects,
+ " " + mainClass + " " + redirects,
clusterDescriptor
.setupApplicationMasterContainer(
mainClass,