YARN-5440. Use AHSClient in YarnClient when TimelineServer is running. (Xuan Gong via gtcarrera9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26de4f0d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26de4f0d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26de4f0d Branch: refs/heads/HADOOP-12756 Commit: 26de4f0de789f58736d1dc383125cffb54debdd0 Parents: 7f3c306 Author: Li Lu <gtcarre...@apache.org> Authored: Thu Jul 28 10:23:18 2016 -0700 Committer: Li Lu <gtcarre...@apache.org> Committed: Thu Jul 28 10:23:18 2016 -0700 ---------------------------------------------------------------------- .../yarn/client/api/impl/YarnClientImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/26de4f0d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java index ae8716e..dee31c5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java @@ -165,13 +165,6 @@ public class YarnClientImpl extends YarnClient { YarnConfiguration.DEFAULT_YARN_CLIENT_APPLICATION_CLIENT_PROTOCOL_POLL_INTERVAL_MS); } - if (conf.getBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED, - YarnConfiguration.DEFAULT_APPLICATION_HISTORY_ENABLED)) { - historyServiceEnabled = true; - historyClient = AHSClient.createAHSClient(); - historyClient.init(conf); - } - if (conf.getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ENABLED)) { timelineServiceEnabled = true; @@ -181,6 +174,18 @@ public class YarnClientImpl extends YarnClient { timelineService = TimelineUtils.buildTimelineTokenService(conf); } + // The AHSClientService is enabled by default when we start the + // TimelineServer which means we are able to get history information + // for applications/applicationAttempts/containers by using ahsClient + // when the TimelineServer is running. + if (timelineServiceEnabled || conf.getBoolean( + YarnConfiguration.APPLICATION_HISTORY_ENABLED, + YarnConfiguration.DEFAULT_APPLICATION_HISTORY_ENABLED)) { + historyServiceEnabled = true; + historyClient = AHSClient.createAHSClient(); + historyClient.init(conf); + } + timelineServiceBestEffort = conf.getBoolean( YarnConfiguration.TIMELINE_SERVICE_CLIENT_BEST_EFFORT, YarnConfiguration.DEFAULT_TIMELINE_SERVICE_CLIENT_BEST_EFFORT); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
