Repository: hadoop Updated Branches: refs/heads/trunk 138148323 -> b5ee7dbd8
YARN-5380. NMTimelinePublisher should use getMemorySize instead of getMemory. Contributed by Vrushali C Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b5ee7dbd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b5ee7dbd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b5ee7dbd Branch: refs/heads/trunk Commit: b5ee7dbd8dde756bc556f823327328f511048021 Parents: 1381483 Author: Naganarasimha <naganarasimha...@apache.org> Authored: Fri Jul 15 14:34:48 2016 +0530 Committer: Naganarasimha <naganarasimha...@apache.org> Committed: Fri Jul 15 14:34:48 2016 +0530 ---------------------------------------------------------------------- .../server/nodemanager/timelineservice/NMTimelinePublisher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5ee7dbd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java index c4d45a9..0371863 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java @@ -168,7 +168,7 @@ public class NMTimelinePublisher extends CompositeService { Map<String, Object> entityInfo = new HashMap<String, Object>(); entityInfo.put(ContainerMetricsConstants.ALLOCATED_MEMORY_ENTITY_INFO, - resource.getMemory()); + resource.getMemorySize()); entityInfo.put(ContainerMetricsConstants.ALLOCATED_VCORE_ENTITY_INFO, resource.getVirtualCores()); entityInfo.put(ContainerMetricsConstants.ALLOCATED_HOST_ENTITY_INFO, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
