[3/4] flink git commit: [FLINK-8872][flip6] fix yarn detached mode command parsing
[FLINK-8872][flip6] fix yarn detached mode command parsing
The detached flag if given by "-yd" was not passed correctly into the
CliFrontend and resulted in the CLI waiting for submitted jobs to finish instead
of detaching from the execution.
[FLINK-8872][yarn] add tests for YARN detached mode command line parsing with
CliFrontend
- create a test-jar of flink-clients
- create CliFrontendRunWithYarnTest based on CliFrontendRunTest that verifies
CliFrontend's parsing in conjunction with FlinkYarnSessionCli
-> verify detached mode in this test (can be extended further in the future)
This closes #5672.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/81e1e4c3
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/81e1e4c3
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/81e1e4c3
Branch: refs/heads/release-1.5
Commit: 81e1e4c312b467dc64c664e30a7132a9f7d55140
Parents: 4317185
Author: Nico Kruber
Authored: Mon Mar 5 18:24:17 2018 +0100
Committer: Till Rohrmann
Committed: Fri Apr 13 12:17:57 2018 -0700
--
flink-clients/pom.xml | 14 +-
.../flink/client/cli/CliFrontendParser.java | 9 ++
.../org/apache/flink/client/cli/DefaultCLI.java | 1 +
.../apache/flink/client/cli/ProgramOptions.java | 4 +-
.../flink/client/program/ClusterClient.java | 2 +-
.../client/program/rest/RestClusterClient.java | 2 +-
.../flink/client/cli/CliFrontendRunTest.java| 2 +-
flink-yarn-tests/pom.xml| 8 +
.../flink/yarn/CliFrontendRunWithYarnTest.java | 148 +++
.../flink/yarn/util/FakeClusterClient.java | 79 ++
.../util/NonDeployingYarnClusterDescriptor.java | 98
.../flink/yarn/cli/FlinkYarnSessionCli.java | 22 +--
.../flink/yarn/FlinkYarnSessionCliTest.java | 19 +++
13 files changed, 392 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flink/blob/81e1e4c3/flink-clients/pom.xml
--
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index 399d080..c7f9e55 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -96,6 +96,18 @@ under the License.
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
maven-assembly-plugin
2.4
@@ -120,7 +132,7 @@ under the License.
-
http://git-wip-us.apache.org/repos/asf/flink/blob/81e1e4c3/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
--
diff --git
a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
index 5a6c0ff..1588aac 100644
---
a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
+++
b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
@@ -62,6 +62,13 @@ public class CliFrontendParser {
public static final Option DETACHED_OPTION = new Option("d",
"detached", false, "If present, runs " +
"the job in detached mode");
+ /**
+* @deprecated use non-prefixed variant {@link #DETACHED_OPTION} for
both YARN and non-YARN deployments
+*/
+ @Deprecated
+ public static final Option YARN_DETACHED_OPTION = new Option("yd",
"yarndetached", false, "If present, runs " +
+ "the job in detached mode (deprecated; use non-YARN specific
option instead)");
+
static final Option ARGS_OPTION = new Option("a", "arguments", true,
"Program arguments. Arguments can also be added without
-a, simply as trailing parameters.");
@@ -117,6 +124,7 @@ public class CliFrontendParser {
LOGGING_OPTION.setRequired(false);
DETACHED_OPTION.setRequired(false);
+ YARN_DETACHED_OPTION.setRequired(false);
ARGS_OPTION.setRequired(false);
ARGS_OPTION.setArgName("programArgs");
@@ -158,6 +166,7 @@ public class CliFrontend
[3/4] flink git commit: [FLINK-8872][flip6] fix yarn detached mode command parsing
[FLINK-8872][flip6] fix yarn detached mode command parsing
The detached flag if given by "-yd" was not passed correctly into the
CliFrontend and resulted in the CLI waiting for submitted jobs to finish instead
of detaching from the execution.
[FLINK-8872][yarn] add tests for YARN detached mode command line parsing with
CliFrontend
- create a test-jar of flink-clients
- create CliFrontendRunWithYarnTest based on CliFrontendRunTest that verifies
CliFrontend's parsing in conjunction with FlinkYarnSessionCli
-> verify detached mode in this test (can be extended further in the future)
This closes #5672.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/fdd1c6ed
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/fdd1c6ed
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/fdd1c6ed
Branch: refs/heads/master
Commit: fdd1c6ed0fed229612ecde1565d90a06dbe6ff55
Parents: ca5573b
Author: Nico Kruber
Authored: Mon Mar 5 18:24:17 2018 +0100
Committer: Till Rohrmann
Committed: Fri Apr 13 10:38:26 2018 -0700
--
flink-clients/pom.xml | 14 +-
.../flink/client/cli/CliFrontendParser.java | 9 ++
.../org/apache/flink/client/cli/DefaultCLI.java | 1 +
.../apache/flink/client/cli/ProgramOptions.java | 4 +-
.../flink/client/program/ClusterClient.java | 2 +-
.../client/program/rest/RestClusterClient.java | 2 +-
.../flink/client/cli/CliFrontendRunTest.java| 2 +-
flink-yarn-tests/pom.xml| 8 +
.../flink/yarn/CliFrontendRunWithYarnTest.java | 148 +++
.../flink/yarn/util/FakeClusterClient.java | 79 ++
.../util/NonDeployingYarnClusterDescriptor.java | 98
.../flink/yarn/cli/FlinkYarnSessionCli.java | 22 +--
.../flink/yarn/FlinkYarnSessionCliTest.java | 19 +++
13 files changed, 392 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flink/blob/fdd1c6ed/flink-clients/pom.xml
--
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index d15e3ff..c96f275 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -96,6 +96,18 @@ under the License.
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
maven-assembly-plugin
2.4
@@ -120,7 +132,7 @@ under the License.
-
http://git-wip-us.apache.org/repos/asf/flink/blob/fdd1c6ed/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
--
diff --git
a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
index 5a6c0ff..1588aac 100644
---
a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
+++
b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontendParser.java
@@ -62,6 +62,13 @@ public class CliFrontendParser {
public static final Option DETACHED_OPTION = new Option("d",
"detached", false, "If present, runs " +
"the job in detached mode");
+ /**
+* @deprecated use non-prefixed variant {@link #DETACHED_OPTION} for
both YARN and non-YARN deployments
+*/
+ @Deprecated
+ public static final Option YARN_DETACHED_OPTION = new Option("yd",
"yarndetached", false, "If present, runs " +
+ "the job in detached mode (deprecated; use non-YARN specific
option instead)");
+
static final Option ARGS_OPTION = new Option("a", "arguments", true,
"Program arguments. Arguments can also be added without
-a, simply as trailing parameters.");
@@ -117,6 +124,7 @@ public class CliFrontendParser {
LOGGING_OPTION.setRequired(false);
DETACHED_OPTION.setRequired(false);
+ YARN_DETACHED_OPTION.setRequired(false);
ARGS_OPTION.setRequired(false);
ARGS_OPTION.setArgName("programArgs");
@@ -158,6 +166,7 @@ public class CliFrontendParse
