[flink] branch release-1.12 updated: [FLINK-20381][yarn] Restore yarn-session.sh -id argument

[rmetzger]

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

rmetzger pushed a commit to branch release-1.12
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.12 by this push:
     new dedf39f  [FLINK-20381][yarn] Restore yarn-session.sh -id argument
dedf39f is described below

commit dedf39f4f89177809be43a4af1951f0c4d92c00c
Author: Robert Metzger <rmetz...@apache.org>
AuthorDate: Mon Nov 30 09:16:25 2020 +0100

    [FLINK-20381][yarn] Restore yarn-session.sh -id argument
    
    This closes #14264
---
 .../src/main/java/org/apache/flink/yarn/cli/AbstractYarnCli.java  | 8 ++++----
 .../java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java    | 2 +-
 .../main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/AbstractYarnCli.java 
b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/AbstractYarnCli.java
index 4e158b2..9bd60c1 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/AbstractYarnCli.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/AbstractYarnCli.java
@@ -33,16 +33,16 @@ abstract class AbstractYarnCli extends 
AbstractCustomCommandLine {
 
        public static final String ID = "yarn-cluster";
 
-       protected Option applicationId =
-               new Option("yid", "yarnapplicationId", true, "Attach to running 
YARN session");
+       protected final Option applicationId;
 
-       protected Option addressOption =
+       protected final Option addressOption =
                new Option("m", "jobmanager", true, "Set to " + ID + " to use 
YARN execution mode.");
 
        protected final Configuration configuration;
 
-       protected AbstractYarnCli(Configuration configuration) {
+       protected AbstractYarnCli(Configuration configuration, String 
shortPrefix, String longPrefix) {
                this.configuration = configuration;
+               this.applicationId = new Option(shortPrefix + "id", longPrefix 
+ "applicationId", true, "Attach to running YARN session");
        }
 
        @Override
diff --git 
a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java
 
b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java
index 6cdc8a0c..31eb4b5 100644
--- 
a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java
+++ 
b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java
@@ -32,7 +32,7 @@ import org.apache.commons.cli.CommandLine;
 public class FallbackYarnSessionCli extends AbstractYarnCli {
 
        public FallbackYarnSessionCli(Configuration configuration) {
-               super(configuration);
+               super(configuration, "y", "yarn");
        }
 
        @Override
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 7824f58..29bff46 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
@@ -171,7 +171,7 @@ public class FlinkYarnSessionCli extends AbstractYarnCli {
                        String shortPrefix,
                        String longPrefix,
                        boolean acceptInteractiveInput) throws FlinkException {
-               super(configuration);
+               super(configuration, shortPrefix, longPrefix);
                this.clusterClientServiceLoader = 
checkNotNull(clusterClientServiceLoader);
                this.configurationDirectory = 
checkNotNull(configurationDirectory);
                this.acceptInteractiveInput = acceptInteractiveInput;