From 1ad2d7b405e340c6cb2aa1eef58d11472c10ba28 Mon Sep 17 00:00:00 2001 From: Jason Darrell Lowe Date: Mon, 21 Jul 2014 21:55:06 +0000 Subject: [PATCH] YARN-2321. NodeManager web UI can incorrectly report Pmem enforcement. Contributed by Leitao Guo git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612411 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index f24fcbb4946..19bf0b4c455 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -79,6 +79,9 @@ Release 2.6.0 - UNRELEASED YARN-2244. FairScheduler missing handling of containers for unknown application attempts. (Anubhav Dhoot via kasha) + YARN-2321. NodeManager web UI can incorrectly report Pmem enforcement + (Leitao Guo via jlowe) + Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java index 5e5408d8de5..92c4187c201 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java @@ -72,7 +72,7 @@ public class NodePage extends NMView { ._("Total Pmem allocated for Container", StringUtils.byteDesc(info.getTotalPmemAllocated() * BYTES_IN_MB)) ._("Pmem enforcement enabled", - info.isVmemCheckEnabled()) + info.isPmemCheckEnabled()) ._("Total VCores allocated for Containers", String.valueOf(info.getTotalVCoresAllocated())) ._("NodeHealthyStatus",