From b674fd57e62300f6f26a3e68501bd54bb5b9d156 Mon Sep 17 00:00:00 2001
From: Maximilian Michels <mxm@apache.org>
Date: Fri, 1 Jul 2016 11:23:41 +0200
Subject: [PATCH] [FLINK-3937] allow -yid without -m yarn-cluster

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

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 cf7040679f9..c0ad27ee950 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
-- 
GitLab