Author: suresh
Date: Tue Jan 29 21:35:24 2013
New Revision: 1440155
URL: http://svn.apache.org/viewvc?rev=1440155&view=rev
Log:
Merging trunk to branch-trunk-win
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/CHANGES.txt?rev=1440155&r1=1440154&r2=1440155&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/CHANGES.txt Tue
Jan 29 21:35:24 2013
@@ -274,6 +274,9 @@ Release 0.23.7 - UNRELEASED
IMPROVEMENTS
+ YARN-133 Update web services docs for RM clusterMetrics (Ravi Prakash via
+ kihwal)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml?rev=1440155&r1=1440154&r2=1440155&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
Tue Jan 29 21:35:24 2013
@@ -93,7 +93,7 @@
<executions>
<execution>
<id>version-info</id>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>version-info</goal>
</goals>
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm?rev=1440155&r1=1440154&r2=1440155&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Tue Jan 29 21:35:24 2013
@@ -177,6 +177,16 @@ ResourceManager REST API's.
*---------------+--------------+-------------------------------+
| appsSubmitted | int | The number of applications submitted |
*---------------+--------------+-------------------------------+
+| appsCompleted | int | The number of applications completed |
+*---------------+--------------+-------------------------------+
+| appsPending | int | The number of applications pending |
+*---------------+--------------+-------------------------------+
+| appsRunning | int | The number of applications running |
+*---------------+--------------+-------------------------------+
+| appsFailed | int | The number of applications failed |
+*---------------+--------------+-------------------------------+
+| appsKilled | int | The number of applications killed |
+*---------------+--------------+-------------------------------+
| reservedMB | long | The amount of memory reserved in MB |
*---------------+--------------+-------------------------------+
| availableMB | long | The amount of memory available in MB |
@@ -187,6 +197,10 @@ ResourceManager REST API's.
*---------------+--------------+-------------------------------+
| containersAllocated | int | The number of containers allocated |
*---------------+--------------+-------------------------------+
+| containersReserved | int | The number of containers reserved |
+*---------------+--------------+-------------------------------+
+| containersPending | int | The number of containers pending |
+*---------------+--------------+-------------------------------+
| totalNodes | int | The total number of nodes |
*---------------+--------------+-------------------------------+
| activeNodes | int | The number of active nodes |
@@ -223,20 +237,26 @@ ResourceManager REST API's.
+---+
{
- "clusterMetrics":
- {
- "appsSubmitted":4,
+ "clusterMetrics":{
+ "appsSubmitted":0,
+ "appsCompleted":0,
+ "appsPending":0,
+ "appsRunning":0,
+ "appsFailed":0,
+ "appsKilled":0,
"reservedMB":0,
- "availableMB":8192,
+ "availableMB":17408,
"allocatedMB":0,
- "totalMB":8192,
"containersAllocated":0,
+ "containersReserved":0,
+ "containersPending":0,
+ "totalMB":17408,
"totalNodes":1,
- "activeNodes":1,
"lostNodes":0,
"unhealthyNodes":0,
"decommissionedNodes":0,
- "rebootedNodes":0
+ "rebootedNodes":0,
+ "activeNodes":1
}
}
+---+
@@ -264,18 +284,25 @@ ResourceManager REST API's.
+---+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<clusterMetrics>
- <appsSubmitted>4</appsSubmitted>
+ <appsSubmitted>0</appsSubmitted>
+ <appsCompleted>0</appsCompleted>
+ <appsPending>0</appsPending>
+ <appsRunning>0</appsRunning>
+ <appsFailed>0</appsFailed>
+ <appsKilled>0</appsKilled>
<reservedMB>0</reservedMB>
- <availableMB>8192</availableMB>
+ <availableMB>17408</availableMB>
<allocatedMB>0</allocatedMB>
<containersAllocated>0</containersAllocated>
- <totalMB>8192</totalMB>
+ <containersReserved>0</containersReserved>
+ <containersPending>0</containersPending>
+ <totalMB>17408</totalMB>
<totalNodes>1</totalNodes>
- <activeNodes>1</activeNodes>
<lostNodes>0</lostNodes>
<unhealthyNodes>0</unhealthyNodes>
<decommissionedNodes>0</decommissionedNodes>
<rebootedNodes>0</rebootedNodes>
+ <activeNodes>1</activeNodes>
</clusterMetrics>
+---+
