Return-Path: 
 <yarn-commits-return-636-apmail-hadoop-yarn-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org
Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 39474E6CE
	for <apmail-hadoop-yarn-commits-archive@minotaur.apache.org>;
 Tue, 29 Jan 2013 23:54:24 +0000 (UTC)
Received: (qmail 76145 invoked by uid 500); 29 Jan 2013 23:54:22 -0000
Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org
Received: (qmail 76037 invoked by uid 500); 29 Jan 2013 23:54:21 -0000
Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:yarn-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:yarn-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:yarn-commits@hadoop.apache.org>
List-Id: <yarn-commits.hadoop.apache.org>
Reply-To: yarn-commits@hadoop.apache.org
Delivered-To: mailing list yarn-commits@hadoop.apache.org
Received: (qmail 75955 invoked by uid 99); 29 Jan 2013 23:54:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jan 2013 23:54:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jan 2013 23:54:20 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B49292388A29;
	Tue, 29 Jan 2013 23:54:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1440222 - in
 /hadoop/common/branches/HDFS-2802/hadoop-yarn-project: CHANGES.txt
 hadoop-yarn/hadoop-yarn-common/pom.xml
 hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Date: Tue, 29 Jan 2013 23:54:01 -0000
To: yarn-commits@hadoop.apache.org
From: szetszwo@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130129235401.B49292388A29@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: szetszwo
Date: Tue Jan 29 23:53:59 2013
New Revision: 1440222

URL: http://svn.apache.org/viewvc?rev=1440222&view=rev
Log:
Merge r1438306 through r1440221 from trunk.

Modified:
    hadoop/common/branches/HDFS-2802/hadoop-yarn-project/CHANGES.txt
    hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
    hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm

Modified: hadoop/common/branches/HDFS-2802/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-yarn-project/CHANGES.txt?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-yarn-project/CHANGES.txt Tue Jan 29 23:53:59 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/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml Tue Jan 29 23:53:59 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/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm Tue Jan 29 23:53:59 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>
 +---+