diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java 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 3da21f0..8b607d2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java @@ -35,11 +35,11 @@ @Metric("# of initializing containers") MutableGaugeInt containersIniting; @Metric MutableGaugeInt containersRunning; - @Metric("Current allocated memory in GB") - MutableGaugeInt allocatedGB; + @Metric("Current allocated memory in MB") + MutableGaugeInt allocatedMB; @Metric("Current # of allocated containers") MutableGaugeInt allocatedContainers; - @Metric MutableGaugeInt availableGB; + @Metric MutableGaugeInt availableMB; @Metric("Current allocated Virtual Cores") MutableGaugeInt allocatedVCores; @Metric MutableGaugeInt availableVCores; @@ -89,22 +89,22 @@ 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()); allocatedVCores.incr(res.getVirtualCores()); availableVCores.decr(res.getVirtualCores()); } 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()); allocatedVCores.decr(res.getVirtualCores()); availableVCores.incr(res.getVirtualCores()); } public void addResource(Resource res) { - availableGB.incr(res.getMemory() / 1024); + availableMB.incr(res.getMemory()); availableVCores.incr(res.getVirtualCores()); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/metrics/TestNodeManagerMetrics.java 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 a54450d..d608fae 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/metrics/TestNodeManagerMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/metrics/TestNodeManagerMetrics.java @@ -60,12 +60,13 @@ metrics.initingContainer(); metrics.runningContainer(); - checkMetrics(5, 1, 1, 1, 1, 1, 2, 2, 6, 4, 12); + checkMetrics(5, 1, 1, 1, 1, 1, 2 * GiB, 2, 6 * GiB, 4, 12); } private void checkMetrics(int launched, int completed, int failed, int killed, - int initing, int running, int allocatedGB, - int allocatedContainers, int availableGB, int allocatedVCores, int availableVCores) { + int initing, int running, int allocatedMB, + int allocatedContainers, int availableMB, int allocatedVCores, + int availableVCores) { MetricsRecordBuilder rb = getMetrics("NodeManagerMetrics"); assertCounter("ContainersLaunched", launched, rb); assertCounter("ContainersCompleted", completed, rb); @@ -73,10 +74,10 @@ 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("AllocatedVCores", allocatedVCores, rb); assertGauge("AllocatedContainers", allocatedContainers, rb); - assertGauge("AvailableGB", availableGB, rb); + assertGauge("AvailableMB", availableMB, rb); assertGauge("AvailableVCores",availableVCores, rb); }