You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2013/06/12 05:52:11 UTC
svn commit: r1492041 - in
/incubator/ambari/branches/branch-1.4.0/ambari-web/app:
assets/data/apps/apps/ utils/
Author: srimanth
Date: Wed Jun 12 03:52:11 2013
New Revision: 1492041
URL: http://svn.apache.org/r1492041
Log:
AMBARI-2360. Handle finished Yarn apps correctly. (billie via srimanth)
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0001.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0003.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0004.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_f9957a11-a902-4f01-ac53-9679ce3a4b13.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/app_graph.js
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0001.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0001.json?rev=1492041&r1=1492040&r2=1492041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0001.json (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0001.json Wed Jun 12 03:52:11 2013
@@ -1,10 +1,10 @@
{
"apps": [
{
- "appId": "job_201301280808_0001",
+ "appId": "application_201301280808_0001",
"appName": "word count",
"appType": "MAPREDUCE",
- "status": "SUCCESS",
+ "status": "FINISHED",
"userName": "ambari_qa",
"submitTime": 1359378637135,
"finishTime": 1359378667350,
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0003.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0003.json?rev=1492041&r1=1492040&r2=1492041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0003.json (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0003.json Wed Jun 12 03:52:11 2013
@@ -1,10 +1,10 @@
{
"apps": [
{
- "appId": "job_201301280808_0003",
+ "appId": "application_201301280808_0003",
"appName": "oozie:launcher:T\\=map-reduce:W\\=map-reduce-wf:A\\=mr-node:ID\\=0000000-130128081151371-oozie-oozi-W",
"appType": "MAPREDUCE",
- "status": "SUCCESS",
+ "status": "FINISHED",
"userName": "ambari_qa",
"submitTime": 1359378907927,
"finishTime": 1359378927213,
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0004.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0004.json?rev=1492041&r1=1492040&r2=1492041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0004.json (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/mapreduce_201301280808_0004.json Wed Jun 12 03:52:11 2013
@@ -1,10 +1,10 @@
{
"apps": [
{
- "appId": "job_201301280808_0002",
+ "appId": "application_201301280808_0002",
"appName": "oozie:action:T\\=map-reduce:W\\=map-reduce-wf:A\\=mr-node:ID\\=0000000-130128081151371-oozie-oozi-W",
"appType": "MAPREDUCE",
- "status": "SUCCESS",
+ "status": "FINISHED",
"userName": "ambari_qa",
"submitTime": 1359378922503,
"finishTime": 1359378949583,
@@ -13,10 +13,10 @@
"workflowEntityName": "2"
},
{
- "appId": "job_201301280808_0004",
+ "appId": "application_201301280808_0004",
"appName": "oozie:action:T\\=map-reduce:W\\=map-reduce-wf:A\\=mr-node:ID\\=0000000-130128081151371-oozie-oozi-W",
"appType": "MAPREDUCE",
- "status": "SUCCESS",
+ "status": "FINISHED",
"userName": "ambari_qa",
"submitTime": 1359378922503,
"finishTime": 1359378949583,
@@ -25,10 +25,10 @@
"workflowEntityName": "4"
},
{
- "appId": "job_201301280808_0003",
+ "appId": "application_201301280808_0003",
"appName": "oozie:action:T\\=map-reduce:W\\=map-reduce-wf:A\\=mr-node:ID\\=0000000-130128081151371-oozie-oozi-W",
"appType": "MAPREDUCE",
- "status": "SUCCESS",
+ "status": "FINISHED",
"userName": "ambari_qa",
"submitTime": 1359378922503,
"finishTime": 1359378949583,
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_f9957a11-a902-4f01-ac53-9679ce3a4b13.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_f9957a11-a902-4f01-ac53-9679ce3a4b13.json?rev=1492041&r1=1492040&r2=1492041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_f9957a11-a902-4f01-ac53-9679ce3a4b13.json (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_f9957a11-a902-4f01-ac53-9679ce3a4b13.json Wed Jun 12 03:52:11 2013
@@ -1,10 +1,10 @@
{
"apps": [
{
- "appId": "job_201301280808_0002",
+ "appId": "application_201301280808_0002",
"appName": "PigLatin:pigSmoke\\.sh",
"appType": "MAPREDUCE",
- "status": "SUCCESS",
+ "status": "FINISHED",
"userName": "ambari_qa",
"submitTime": 1359378741973,
"finishTime": 1359378760098,
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/app_graph.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/app_graph.js?rev=1492041&r1=1492040&r2=1492041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/app_graph.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/app_graph.js Wed Jun 12 03:52:11 2013
@@ -41,7 +41,7 @@ module.exports = {
"startTime:"+(new Date(jobData[i].submitTime).toUTCString())+" \n"+
"duration:"+formatDuration(jobData[i].finishTime - jobData[i].submitTime);
console.log("info "+jobData[i].info);
- jobData[i].state = jobData[i].status.substr(0,4)=="SUCC";
+ jobData[i].state = jobData[i].status==="FINISHED";
minStartTime = Math.min(minStartTime, jobData[i].submitTime);
maxFinishTime = Math.max(maxFinishTime, jobData[i].finishTime);
// add a node to the nodes array and to a provided map of entity names to nodes