diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java index 4d62247..f0bd802 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java @@ -36,10 +36,10 @@ MutableGaugeInt containersIniting; @Metric MutableGaugeInt containersRunning; @Metric("Current allocated memory in GB") - MutableGaugeInt allocatedGB; + MutableGaugeInt allocatedMB; @Metric("Current # of allocated containers") MutableGaugeInt allocatedContainers; - @Metric MutableGaugeInt availableGB; + @Metric MutableGaugeInt availableMB; public static NodeManagerMetrics create() { return create(DefaultMetricsSystem.instance()); @@ -86,17 +86,17 @@ public void endRunningContainer() { public void allocateContainer(Resource res) { allocatedContainers.incr(); - allocatedGB.incr(res.getMemory() / 1024); - availableGB.decr(res.getMemory() / 1024); + allocatedMB.incr(res.getMemory()); + availableMB.decr(res.getMemory()); } public void releaseContainer(Resource res) { allocatedContainers.decr(); - allocatedGB.decr(res.getMemory() / 1024); - availableGB.incr(res.getMemory() / 1024); + allocatedMB.decr(res.getMemory()); + availableMB.incr(res.getMemory()); } public void addResource(Resource res) { - availableGB.incr(res.getMemory() / 1024); + availableMB.incr(res.getMemory()); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/metrics/TestNodeManagerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/metrics/TestNodeManagerMetrics.java index 8384220..d01dd3f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/metrics/TestNodeManagerMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/metrics/TestNodeManagerMetrics.java @@ -57,12 +57,12 @@ metrics.initingContainer(); metrics.runningContainer(); - checkMetrics(5, 1, 1, 1, 1, 1, 2, 2, 6); + checkMetrics(5, 1, 1, 1, 1, 1, 2*GiB, 2, 6*GiB); } private void checkMetrics(int launched, int completed, int failed, int killed, - int initing, int running, int allocatedGB, - int allocatedContainers, int availableGB) { + int initing, int running, int allocatedMB, + int allocatedContainers, int availableMB) { MetricsRecordBuilder rb = getMetrics("NodeManagerMetrics"); assertCounter("ContainersLaunched", launched, rb); assertCounter("ContainersCompleted", completed, rb); @@ -70,8 +70,8 @@ private void checkMetrics(int launched, int completed, int failed, int killed, assertCounter("ContainersKilled", killed, rb); assertGauge("ContainersIniting", initing, rb); assertGauge("ContainersRunning", running, rb); - assertGauge("AllocatedGB", allocatedGB, rb); + assertGauge("AllocatedMB", allocatedMB, rb); assertGauge("AllocatedContainers", allocatedContainers, rb); - assertGauge("AvailableGB", availableGB, rb); + assertGauge("AvailableMB", availableMB, rb); } }