flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [7/7] flink git commit: [FLINK-3937] allow -yid without -m yarn-cluster
Date Fri, 01 Jul 2016 13:22:14 GMT
[FLINK-3937] allow -yid without -m yarn-cluster


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

Branch: refs/heads/master
Commit: b674fd57e62300f6f26a3e68501bd54bb5b9d156
Parents: cfd48a6
Author: Maximilian Michels <mxm@apache.org>
Authored: Fri Jul 1 11:23:41 2016 +0200
Committer: Maximilian Michels <mxm@apache.org>
Committed: Fri Jul 1 15:22:31 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/b674fd57/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
index cf70406..c0ad27e 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
@@ -456,7 +456,8 @@ public class FlinkYarnSessionCli implements CustomCommandLine<YarnClusterClient>
 	public boolean isActive(CommandLine commandLine, Configuration configuration) {
 		String jobManagerOption = commandLine.getOptionValue(ADDRESS_OPTION.getOpt(), null);
 		boolean yarnJobManager = ID.equals(jobManagerOption);
-		return yarnJobManager || resumeFromYarnProperties(commandLine, configuration);
+		boolean yarnAppId = commandLine.hasOption(APPLICATION_ID.getOpt());
+		return yarnJobManager || yarnAppId || resumeFromYarnProperties(commandLine, configuration);
 	}
 
 	@Override


Mime
View raw message