[flink] 02/06: [hotfix] Remove "shutdown if attached" option from "all" YARN options

[aljoscha]

This is an automated email from the ASF dual-hosted git repository.

aljoscha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit b8153d3b7dfdcaf4660f1531b3e984a63c5c1741
Author: Aljoscha Krettek <aljos...@apache.org>
AuthorDate: Sat Dec 7 17:28:31 2019 +0100

    [hotfix] Remove "shutdown if attached" option from "all" YARN options
    
    Adding this option here means that the check in
    isYarnPropertiesFileMode() will mistakenly think that "shutown if
    attached" is a YARN option and therefore not execute an attached job
    with this option on an existing YARN session.
---
 .../src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java    | 2 --
 1 file changed, 2 deletions(-)

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 2e035e7..fd97496 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
@@ -85,7 +85,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
 import static org.apache.flink.client.cli.CliFrontendParser.DETACHED_OPTION;
-import static 
org.apache.flink.client.cli.CliFrontendParser.SHUTDOWN_IF_ATTACHED_OPTION;
 import static 
org.apache.flink.client.cli.CliFrontendParser.YARN_DETACHED_OPTION;
 import static 
org.apache.flink.configuration.HighAvailabilityOptions.HA_CLUSTER_ID;
 import static org.apache.flink.util.Preconditions.checkNotNull;
@@ -217,7 +216,6 @@ public class FlinkYarnSessionCli extends 
AbstractCustomCommandLine {
                allOptions.addOption(slots);
                allOptions.addOption(dynamicproperties);
                allOptions.addOption(DETACHED_OPTION);
-               allOptions.addOption(SHUTDOWN_IF_ATTACHED_OPTION);
                allOptions.addOption(YARN_DETACHED_OPTION);
                allOptions.addOption(name);
                allOptions.addOption(applicationId);