YARN-3377. Fixed test failure in TestTimelineServiceClientIntegration. Contributed by Sangjin Lee.
(cherry picked from commit 04de2ceccd02edb00bd671a63e04855c132e9735) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/afa99256 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/afa99256 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/afa99256 Branch: refs/heads/YARN-2928 Commit: afa99256694dc3d4c4c2f74e2a5a9e7c846c57a2 Parents: 63c7210 Author: Zhijie Shen <zjs...@apache.org> Authored: Fri Mar 20 00:20:24 2015 -0700 Committer: Sangjin Lee <sj...@apache.org> Committed: Tue Aug 25 10:38:43 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../timelineservice/collector/TimelineCollectorManager.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/afa99256/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 42da7bf..d9696c9 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -35,6 +35,9 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1 YARN-3333. Rename TimelineAggregator etc. to TimelineCollector. (Sangjin Lee via junping_du) + YARN-3377. Fixed test failure in TestTimelineServiceClientIntegration. + (Sangjin Lee via zjshen) + IMPROVEMENTS OPTIMIZATIONS http://git-wip-us.apache.org/repos/asf/hadoop/blob/afa99256/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java index 3691162..3a4515e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java @@ -239,8 +239,7 @@ public class TimelineCollectorManager extends CompositeService { + GenericExceptionHandler.class.getPackage().getName() + ";" + YarnJacksonJaxbJsonProvider.class.getPackage().getName(), "/*"); - timelineRestServer.setAttribute(COLLECTOR_MANAGER_ATTR_KEY, - TimelineCollectorManager.getInstance()); + timelineRestServer.setAttribute(COLLECTOR_MANAGER_ATTR_KEY, this); timelineRestServer.start(); } catch (Exception e) { String msg = "The per-node collector webapp failed to start.";
