You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/01/19 16:20:50 UTC

[2/4] flink git commit: [FLINK-5543] [client] Add a comment to the code about adding a customCommandLine to the CLI

[FLINK-5543] [client] Add a comment to the code about adding a customCommandLine to the CLI

This closes #3144


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cda40a7f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cda40a7f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cda40a7f

Branch: refs/heads/master
Commit: cda40a7fe7ca7c5140dc627b077caa29027f113c
Parents: e1b2cd0
Author: shijinkui <sh...@huawei.com>
Authored: Wed Jan 18 08:32:31 2017 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Jan 19 17:18:48 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/flink/client/CliFrontend.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/cda40a7f/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
index dc3280e..b6543a3 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
@@ -128,8 +128,10 @@ public class CliFrontend {
 	private static final List<CustomCommandLine> customCommandLine = new LinkedList<>();
 
 	static {
-		/** command line interface of the YARN session, with a special initialization here
-		 *  to prefix all options with y/yarn. */
+		//	Command line interface of the YARN session, with a special initialization here
+		//	to prefix all options with y/yarn.
+		//	Tips: DefaultCLI must be added at last, because getActiveCustomCommandLine(..) will get the
+		//	      active CustomCommandLine in order and DefaultCLI isActive always return true.
 		loadCustomCommandLine("org.apache.flink.yarn.cli.FlinkYarnSessionCli", "y", "yarn");
 		loadCustomCommandLine("org.apache.flink.yarn.cli.FlinkYarnCLI", "y", "yarn");
 		customCommandLine.add(new DefaultCLI());