hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From su...@apache.org
Subject [31/50] hadoop git commit: YARN-5380. NMTimelinePublisher should use getMemorySize instead of getMemory. Contributed by Vrushali C
Date Tue, 19 Jul 2016 21:41:31 GMT
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/339c76b5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/339c76b5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/339c76b5

Branch: refs/heads/YARN-2915
Commit: 339c76b53f9d3c7f0f242cbb39f0fe4eefae97df
Parents: 16872b3
Author: Naganarasimha <naganarasimha_gr@apache.org>
Authored: Fri Jul 15 14:34:48 2016 +0530
Committer: Subru Krishnan <subru@apache.org>
Committed: Tue Jul 19 14:39:31 2016 -0700

----------------------------------------------------------------------
 .../server/nodemanager/timelineservice/NMTimelinePublisher.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/339c76b5/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message