Author: vinodkv
Date: Sat Sep 28 16:30:28 2013
New Revision: 1527206
URL: http://svn.apache.org/r1527206
Log:
YARN-1246. Added application finish-status to ApplicationSummary for the sake
of testing given ApplicationHistoryServer is not yet ready. Contributed by
Arpit Gupta.
svn merge --ignore-ancestry -c 1527205 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1527206&r1=1527205&r2=1527206&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Sat Sep 28
16:30:28 2013
@@ -60,6 +60,10 @@ Release 2.1.2 - UNRELEASED
IMPROVEMENTS
+ YARN-1246. Added application finish-status to ApplicationSummary for the
sake
+ of testing given ApplicationHistoryServer is not yet ready. (Arpit Gupta
via
+ vinodkv)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java?rev=1527206&r1=1527205&r2=1527206&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
Sat Sep 28 16:30:28 2013
@@ -151,7 +151,8 @@ public class RMAppManager implements Eve
.add("trackingUrl", trackingUrl)
.add("appMasterHost", host)
.add("startTime", app.getStartTime())
- .add("finishTime", app.getFinishTime());
+ .add("finishTime", app.getFinishTime())
+ .add("finalStatus", app.getFinalApplicationStatus());
return summary;
}