This is an automated email from the ASF dual-hosted git repository. trohrmann pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit b3f102d62214b303a4cc71b9e410e4af2e18c812 Author: Victor Wong <[email protected]> AuthorDate: Fri May 10 12:20:40 2019 +0800 [FLINK-12468][yarn] Unregister application from the YARN Resource Manager with a valid appTrackingUrl --- docs/_includes/generated/yarn_config_configuration.html | 5 +++++ .../src/main/java/org/apache/flink/yarn/YarnResourceManager.java | 3 ++- .../org/apache/flink/yarn/configuration/YarnConfigOptions.java | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/_includes/generated/yarn_config_configuration.html b/docs/_includes/generated/yarn_config_configuration.html index 40dfc09..4943ef8 100644 --- a/docs/_includes/generated/yarn_config_configuration.html +++ b/docs/_includes/generated/yarn_config_configuration.html @@ -48,6 +48,11 @@ <td>Time between heartbeats with the ResourceManager in seconds.</td> </tr> <tr> + <td><h5>yarn.history.server.address</h5></td> + <td style="word-wrap: break-word;">(none)</td> + <td>The address of Flink HistoryServer.</td> + </tr> + <tr> <td><h5>yarn.maximum-failed-containers</h5></td> <td style="word-wrap: break-word;">(none)</td> <td>Maximum number of containers the system is going to reallocate in case of a failure.</td> diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java index d054afe..b9ea02b 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java @@ -292,8 +292,9 @@ public class YarnResourceManager extends ResourceManager<YarnWorkerNode> impleme FinalApplicationStatus yarnStatus = getYarnStatus(finalStatus); log.info("Unregister application from the YARN Resource Manager with final status {}.", yarnStatus); + String historyServerAddress = flinkConfig.getString(YarnConfigOptions.APPLICATION_HISTORY_SERVER_ADDRESS); try { - resourceManagerClient.unregisterApplicationMaster(yarnStatus, diagnostics, ""); + resourceManagerClient.unregisterApplicationMaster(yarnStatus, diagnostics, historyServerAddress); } catch (Throwable t) { log.error("Could not unregister the application master.", t); } diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/configuration/YarnConfigOptions.java b/flink-yarn/src/main/java/org/apache/flink/yarn/configuration/YarnConfigOptions.java index 0f46a57..ff6697fd 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/configuration/YarnConfigOptions.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/configuration/YarnConfigOptions.java @@ -180,6 +180,15 @@ public class YarnConfigOptions { .defaultValue("") .withDescription("A comma-separated list of tags to apply to the Flink YARN application."); + /** + * The address of Flink HistoryServer. + * This configuration parameter allows setting the appTrackingUrl for finished YARN applications. + */ + public static final ConfigOption<String> APPLICATION_HISTORY_SERVER_ADDRESS = + key("yarn.history.server.address") + .defaultValue("") + .withDescription("The address of Flink HistoryServer."); + // ------------------------------------------------------------------------ /** This class is not meant to be instantiated. */
