From 72ddd0ad5eb27eadd5848674d8613a0d9445aac9 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Mon, 8 Feb 2016 10:24:52 -0800 Subject: [PATCH] [FLINK-3372] Setting custom YARN application name is ignored --- .../src/main/java/org/apache/flink/client/CliFrontend.java | 3 +-- .../java/org/apache/flink/client/FlinkYarnSessionCli.java | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) 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 7c8d52edf87867..d830361ae633b9 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 @@ protected Client getClient( // 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(); 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 a9a20ae286cc09..ff11c19f5e3067 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 FlinkYarnSessionCli(String shortPrefix, String longPrefix) { } 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 boolean accept(File dir, String name) { } if(cmd.hasOption(NAME.getOpt())) { flinkYarnClient.setName(cmd.getOptionValue(NAME.getOpt())); + } else if (programName != null && !programName.isEmpty()) { + flinkYarnClient.setName("Flink Application: " + programName); } return flinkYarnClient; }