Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page. (Naganarasimha G R via wangda) 

(cherry picked from commit f55d21d894)
This commit is contained in:
Wangda Tan 2015-05-08 12:04:50 -07:00
parent a481f950c3
commit f8807839c6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -154,6 +154,9 @@ Release 2.8.0 - UNRELEASED
YARN-20. More information for "yarn.resourcemanager.webapp.address" in YARN-20. More information for "yarn.resourcemanager.webapp.address" in
yarn-default.xml (Bartosz Ługowski vai tgraves) yarn-default.xml (Bartosz Ługowski vai tgraves)
YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page.
(Naganarasimha G R via wangda)
OPTIMIZATIONS OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not YARN-3339. TestDockerContainerExecutor should pull a single image and not

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.java
View File

@ -49,6 +49,7 @@ public class NodeLabelsPage extends RmView {
thead(). thead().
tr(). tr().
th(".name", "Label Name"). th(".name", "Label Name").
th(".type", "Label Type").
th(".numOfActiveNMs", "Num Of Active NMs"). th(".numOfActiveNMs", "Num Of Active NMs").
th(".totalResource", "Total Resource"). th(".totalResource", "Total Resource").
_()._(). _()._().
@ -58,8 +59,12 @@ public class NodeLabelsPage extends RmView {
for (RMNodeLabel info : nlm.pullRMNodeLabelsInfo()) { for (RMNodeLabel info : nlm.pullRMNodeLabelsInfo()) {
TR<TBODY<TABLE<Hamlet>>> row = TR<TBODY<TABLE<Hamlet>>> row =
tbody.tr().td( tbody.tr().td(
info.getLabelName().isEmpty() ? "<NO_LABEL>" : info info.getLabelName().isEmpty() ? "<DEFAULT_PARTITION>" : info
.getLabelName()); .getLabelName());
String type =
(info.getIsExclusive()) ? "Exclusive Partition"
: "Non Exclusive Partition";
row = row.td(type);
int nActiveNMs = info.getNumActiveNMs(); int nActiveNMs = info.getNumActiveNMs();
if (nActiveNMs > 0) { if (nActiveNMs > 0) {
row = row.td() row = row.td()