Repository: flink Updated Branches: refs/heads/release-0.10 2cd06181f -> 11bfe6f3e
[FLINK-3372] Setting custom YARN application name is ignored This closes #1607 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/11bfe6f3 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/11bfe6f3 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/11bfe6f3 Branch: refs/heads/release-0.10 Commit: 11bfe6f3e9956101e76fbb3b3b8dccee93d81eb3 Parents: 2cd0618 Author: Nick Dimiduk <ndimi...@apache.org> Authored: Mon Feb 8 10:24:52 2016 -0800 Committer: Stephan Ewen <se...@apache.org> Committed: Wed Feb 10 15:20:49 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/flink/client/CliFrontend.java | 3 +-- .../main/java/org/apache/flink/client/FlinkYarnSessionCli.java | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/11bfe6f3/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 7c8d52e..d830361 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 @@ -813,11 +813,10 @@ public class CliFrontend { // user wants to run Flink in YARN cluster. CommandLine commandLine = options.getCommandLine(); - AbstractFlinkYarnClient flinkYarnClient = CliFrontendParser.getFlinkYarnSessionCli().createFlinkYarnClient(commandLine); + AbstractFlinkYarnClient flinkYarnClient = CliFrontendParser.getFlinkYarnSessionCli().createFlinkYarnClient(commandLine, programName); if (flinkYarnClient == null) { throw new RuntimeException("Unable to create Flink YARN Client. Check previous log messages"); } - flinkYarnClient.setName("Flink Application: " + programName); // the number of slots available from YARN: int yarnTmSlots = flinkYarnClient.getTaskManagerSlots(); http://git-wip-us.apache.org/repos/asf/flink/blob/11bfe6f3/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java b/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java index a9a20ae..ff11c19 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java +++ b/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java @@ -103,6 +103,10 @@ public class FlinkYarnSessionCli { } public AbstractFlinkYarnClient createFlinkYarnClient(CommandLine cmd) { + return createFlinkYarnClient(cmd, null); + } + + public AbstractFlinkYarnClient createFlinkYarnClient(CommandLine cmd, String programName) { AbstractFlinkYarnClient flinkYarnClient = getFlinkYarnClient(); if (flinkYarnClient == null) { @@ -225,6 +229,8 @@ public class FlinkYarnSessionCli { } if(cmd.hasOption(NAME.getOpt())) { flinkYarnClient.setName(cmd.getOptionValue(NAME.getOpt())); + } else if (programName != null && !programName.isEmpty()) { + flinkYarnClient.setName("Flink Application: " + programName); } return flinkYarnClient; }
