[11/50] [abbrv] hadoop git commit: YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee)
YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee) (cherry picked from commit 58221188811e0f61d842dac89e1f4ad4fd8aa182) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e9e8d853 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e9e8d853 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e9e8d853 Branch: refs/heads/YARN-2928 Commit: e9e8d853ba904c89270e901a4a5327f85bd06050 Parents: 8438977 Author: Sangjin Lee sj...@apache.org Authored: Fri Apr 24 16:56:23 2015 -0700 Committer: Sangjin Lee sj...@apache.org Committed: Tue Aug 25 10:47:09 2015 -0700 -- hadoop-yarn-project/CHANGES.txt | 2 + .../resourcemanager/RMActiveServiceContext.java | 13 +- .../server/resourcemanager/RMAppManager.java| 15 +- .../yarn/server/resourcemanager/RMContext.java | 7 +- .../server/resourcemanager/RMContextImpl.java | 12 +- .../server/resourcemanager/ResourceManager.java | 14 +- .../server/resourcemanager/rmapp/RMAppImpl.java | 15 ++ .../timelineservice/RMTimelineCollector.java| 111 .../RMTimelineCollectorManager.java | 75 ++ .../TestTimelineServiceClientIntegration.java | 12 +- .../collector/AppLevelTimelineCollector.java| 2 +- .../collector/NodeTimelineCollectorManager.java | 223 .../PerNodeTimelineCollectorsAuxService.java| 15 +- .../collector/TimelineCollector.java| 2 +- .../collector/TimelineCollectorManager.java | 259 +++ .../collector/TimelineCollectorWebService.java | 23 +- .../TestNMTimelineCollectorManager.java | 160 ...TestPerNodeTimelineCollectorsAuxService.java | 24 +- .../collector/TestTimelineCollectorManager.java | 160 19 files changed, 585 insertions(+), 559 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e9e8d853/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index aea859a..43d292a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -53,6 +53,8 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1 YARN-3391. Clearly define flow ID/ flow run / flow version in API and storage. (Zhijie Shen via junping_du) +YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee) + IMPROVEMENTS OPTIMIZATIONS http://git-wip-us.apache.org/repos/asf/hadoop/blob/e9e8d853/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java index d79e542..17346ef 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java @@ -47,7 +47,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.security.DelegationTokenRen import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM; import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager; import org.apache.hadoop.yarn.server.resourcemanager.security.RMDelegationTokenSecretManager; -import org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollector; +import org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollectorManager; import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.SystemClock; @@ -95,7 +95,7 @@ public class RMActiveServiceContext { private ApplicationMasterService applicationMasterService; private RMApplicationHistoryWriter rmApplicationHistoryWriter; private SystemMetricsPublisher systemMetricsPublisher; - private RMTimelineCollector timelineCollector; + private RMTimelineCollectorManager timelineCollectorManager; private RMNodeLabelsManager nodeLabelManager; private long epoch; @@ -377,14 +377,15 @@ public class RMActiveServiceContext { @Private @Unstable - public RMTimelineCollector getRMTimelineCollector() { -
[19/50] [abbrv] hadoop git commit: YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee)
YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee) (cherry picked from commit 58221188811e0f61d842dac89e1f4ad4fd8aa182) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a12a5766 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a12a5766 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a12a5766 Branch: refs/heads/YARN-2928-new Commit: a12a5766ab1544b08b45827a2bba1dd7e59ebf0a Parents: f19c14a Author: Sangjin Lee sj...@apache.org Authored: Fri Apr 24 16:56:23 2015 -0700 Committer: Vinod Kumar Vavilapalli vino...@apache.org Committed: Thu Aug 13 13:53:26 2015 -0700 -- hadoop-yarn-project/CHANGES.txt | 2 + .../resourcemanager/RMActiveServiceContext.java | 13 +- .../server/resourcemanager/RMAppManager.java| 15 +- .../yarn/server/resourcemanager/RMContext.java | 7 +- .../server/resourcemanager/RMContextImpl.java | 12 +- .../server/resourcemanager/ResourceManager.java | 14 +- .../server/resourcemanager/rmapp/RMAppImpl.java | 15 ++ .../timelineservice/RMTimelineCollector.java| 111 .../RMTimelineCollectorManager.java | 75 ++ .../TestTimelineServiceClientIntegration.java | 12 +- .../collector/AppLevelTimelineCollector.java| 2 +- .../collector/NodeTimelineCollectorManager.java | 223 .../PerNodeTimelineCollectorsAuxService.java| 15 +- .../collector/TimelineCollector.java| 2 +- .../collector/TimelineCollectorManager.java | 259 +++ .../collector/TimelineCollectorWebService.java | 23 +- .../TestNMTimelineCollectorManager.java | 160 ...TestPerNodeTimelineCollectorsAuxService.java | 24 +- .../collector/TestTimelineCollectorManager.java | 160 19 files changed, 585 insertions(+), 559 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a12a5766/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ffd559b..b70611c 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -53,6 +53,8 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1 YARN-3391. Clearly define flow ID/ flow run / flow version in API and storage. (Zhijie Shen via junping_du) +YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee) + IMPROVEMENTS OPTIMIZATIONS http://git-wip-us.apache.org/repos/asf/hadoop/blob/a12a5766/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java index d79e542..17346ef 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java @@ -47,7 +47,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.security.DelegationTokenRen import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM; import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager; import org.apache.hadoop.yarn.server.resourcemanager.security.RMDelegationTokenSecretManager; -import org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollector; +import org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollectorManager; import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.SystemClock; @@ -95,7 +95,7 @@ public class RMActiveServiceContext { private ApplicationMasterService applicationMasterService; private RMApplicationHistoryWriter rmApplicationHistoryWriter; private SystemMetricsPublisher systemMetricsPublisher; - private RMTimelineCollector timelineCollector; + private RMTimelineCollectorManager timelineCollectorManager; private RMNodeLabelsManager nodeLabelManager; private long epoch; @@ -377,14 +377,15 @@ public class RMActiveServiceContext { @Private @Unstable - public RMTimelineCollector
hadoop git commit: YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee)
Repository: hadoop Updated Branches: refs/heads/YARN-2928 5eeb2b156 - 582211888 YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58221188 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58221188 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58221188 Branch: refs/heads/YARN-2928 Commit: 58221188811e0f61d842dac89e1f4ad4fd8aa182 Parents: 5eeb2b1 Author: Sangjin Lee sj...@apache.org Authored: Fri Apr 24 16:56:23 2015 -0700 Committer: Sangjin Lee sj...@apache.org Committed: Fri Apr 24 16:56:23 2015 -0700 -- hadoop-yarn-project/CHANGES.txt | 2 + .../resourcemanager/RMActiveServiceContext.java | 13 +- .../server/resourcemanager/RMAppManager.java| 3 +- .../yarn/server/resourcemanager/RMContext.java | 7 +- .../server/resourcemanager/RMContextImpl.java | 12 +- .../server/resourcemanager/ResourceManager.java | 14 +- .../server/resourcemanager/rmapp/RMAppImpl.java | 15 ++ .../timelineservice/RMTimelineCollector.java| 111 .../RMTimelineCollectorManager.java | 75 ++ .../TestTimelineServiceClientIntegration.java | 12 +- .../collector/AppLevelTimelineCollector.java| 2 +- .../collector/NodeTimelineCollectorManager.java | 223 .../PerNodeTimelineCollectorsAuxService.java| 15 +- .../collector/TimelineCollector.java| 2 +- .../collector/TimelineCollectorManager.java | 259 +++ .../collector/TimelineCollectorWebService.java | 23 +- .../TestNMTimelineCollectorManager.java | 160 ...TestPerNodeTimelineCollectorsAuxService.java | 24 +- .../collector/TestTimelineCollectorManager.java | 160 19 files changed, 578 insertions(+), 554 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/58221188/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index a3ca475..408b8e6 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -53,6 +53,8 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1 YARN-3391. Clearly define flow ID/ flow run / flow version in API and storage. (Zhijie Shen via junping_du) +YARN-3390. Reuse TimelineCollectorManager for RM (Zhijie Shen via sjlee) + IMPROVEMENTS OPTIMIZATIONS http://git-wip-us.apache.org/repos/asf/hadoop/blob/58221188/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java index 1d95204..00768ed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java @@ -47,7 +47,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.security.DelegationTokenRen import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM; import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager; import org.apache.hadoop.yarn.server.resourcemanager.security.RMDelegationTokenSecretManager; -import org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollector; +import org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollectorManager; import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.SystemClock; @@ -95,7 +95,7 @@ public class RMActiveServiceContext { private ApplicationMasterService applicationMasterService; private RMApplicationHistoryWriter rmApplicationHistoryWriter; private SystemMetricsPublisher systemMetricsPublisher; - private RMTimelineCollector timelineCollector; + private RMTimelineCollectorManager timelineCollectorManager; private RMNodeLabelsManager nodeLabelManager; private long epoch; @@ -379,14 +379,15 @@ public class RMActiveServiceContext { @Private @Unstable - public RMTimelineCollector