You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/06/14 00:02:21 UTC
svn commit: r1492883 - in
/incubator/ambari/branches/branch-1.4.0/ambari-web/app: assets/data/apps/
assets/data/apps/apps/ classes/ controllers/main/ utils/ views/main/
Author: yusaku
Date: Thu Jun 13 22:02:21 2013
New Revision: 1492883
URL: http://svn.apache.org/r1492883
Log:
AMBARI-2381. Add Yarn as app type in UI. (billie via yusaku)
Added:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_c1af4446-64d2-46fb-be69-6363e7ec89fe.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/yarn_1371140159837_0001.json
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/runs2.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/classes/run_class.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/apps_controller.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/app_graph.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js
Added: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_c1af4446-64d2-46fb-be69-6363e7ec89fe.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_c1af4446-64d2-46fb-be69-6363e7ec89fe.json?rev=1492883&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_c1af4446-64d2-46fb-be69-6363e7ec89fe.json (added)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/pig_c1af4446-64d2-46fb-be69-6363e7ec89fe.json Thu Jun 13 22:02:21 2013
@@ -0,0 +1,89 @@
+{
+ "apps": [
+ {
+ "appId": "application_1371140159837_0004",
+ "appName": "PigLatin:script1-hadoop.pig",
+ "appType": "MAPREDUCE",
+ "status": "FINISHED",
+ "userName": "ambari-qa",
+ "queue": "default",
+ "submitTime": 1371141211530,
+ "launchTime": 1371141211530,
+ "finishTime": 1371141316943,
+ "stages": [
+ 1,
+ 1
+ ],
+ "workflowId": "pig_c1af4446-64d2-46fb-be69-6363e7ec89fe",
+ "workflowEntityName": "scope-72"
+ },
+ {
+ "appId": "application_1371140159837_0005",
+ "appName": "PigLatin:script1-hadoop.pig",
+ "appType": "MAPREDUCE",
+ "status": "FINISHED",
+ "userName": "ambari-qa",
+ "queue": "default",
+ "submitTime": 1371141327050,
+ "launchTime": 1371141327050,
+ "finishTime": 1371141364567,
+ "stages": [
+ 1,
+ 1
+ ],
+ "workflowId": "pig_c1af4446-64d2-46fb-be69-6363e7ec89fe",
+ "workflowEntityName": "scope-80"
+ },
+ {
+ "appId": "application_1371140159837_0006",
+ "appName": "PigLatin:script1-hadoop.pig",
+ "appType": "MAPREDUCE",
+ "status": "FINISHED",
+ "userName": "ambari-qa",
+ "queue": "default",
+ "submitTime": 1371141370351,
+ "launchTime": 1371141370351,
+ "finishTime": 1371141412252,
+ "stages": [
+ 1,
+ 1
+ ],
+ "workflowId": "pig_c1af4446-64d2-46fb-be69-6363e7ec89fe",
+ "workflowEntityName": "scope-83"
+ },
+ {
+ "appId": "application_1371140159837_0007",
+ "appName": "PigLatin:script1-hadoop.pig",
+ "appType": "MAPREDUCE",
+ "status": "FINISHED",
+ "userName": "ambari-qa",
+ "queue": "default",
+ "submitTime": 1371141419373,
+ "launchTime": 1371141419373,
+ "finishTime": 1371141448848,
+ "stages": [
+ 1,
+ 1
+ ],
+ "workflowId": "pig_c1af4446-64d2-46fb-be69-6363e7ec89fe",
+ "workflowEntityName": "scope-86"
+ },
+ {
+ "appId": "application_1371140159837_0008",
+ "appName": "PigLatin:script1-hadoop.pig",
+ "appType": "MAPREDUCE",
+ "status": "FINISHED",
+ "userName": "ambari-qa",
+ "queue": "default",
+ "submitTime": 1371141452275,
+ "launchTime": 1371141452275,
+ "finishTime": 1371141483744,
+ "stages": [
+ 1,
+ 1
+ ],
+ "workflowId": "pig_c1af4446-64d2-46fb-be69-6363e7ec89fe",
+ "workflowEntityName": "scope-103"
+ }
+ ]
+}
Added: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/yarn_1371140159837_0001.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/yarn_1371140159837_0001.json?rev=1492883&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/yarn_1371140159837_0001.json (added)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/apps/yarn_1371140159837_0001.json Thu Jun 13 22:02:21 2013
@@ -0,0 +1,18 @@
+{
+ "apps": [
+ {
+ "appId": "application_1371140159837_0001",
+ "appName": "yarnservicecheck",
+ "appType": "YARN",
+ "status": "FINISHED",
+ "userName": "hdfs",
+ "queue": "default",
+ "submitTime": 1371140224391,
+ "launchTime": 1371140224420,
+ "finishTime": 1371140233914,
+ "stages": [],
+ "workflowId": "yarn_1371140159837_0001",
+ "workflowEntityName": "1"
+ }
+ ]
+}
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/runs2.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/runs2.json?rev=1492883&r1=1492882&r2=1492883&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/runs2.json (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/apps/runs2.json Thu Jun 13 22:02:21 2013
@@ -1,9 +1,9 @@
{
"sEcho": 0,
- "iTotalRecords": 4,
- "iTotalDisplayRecords": 4,
+ "iTotalRecords": 6,
+ "iTotalDisplayRecords": 6,
"startIndex": 0,
- "endIndex": 3,
+ "endIndex": 5,
"aaData": [
{
"workflowId": "mapreduce_201301280808_0001",
@@ -98,10 +98,51 @@
]
}
}
+ },
+ {
+ "workflowId": "pig_c1af4446-64d2-46fb-be69-6363e7ec89fe",
+ "workflowName": "script1-hadoop.pig",
+ "userName": "ambari-qa",
+ "startTime": 1371141211530,
+ "elapsedTime": 272214,
+ "inputBytes": 0,
+ "outputBytes": 0,
+ "numJobsTotal": 5,
+ "numJobsCompleted": 5,
+ "workflowContext": {
+ "workflowDag": {
+ "entries": [
+ { "source": "scope-103", "targets": [] },
+ { "source": "scope-72", "targets": [ "scope-80" ] },
+ { "source": "scope-80", "targets": [ "scope-83" ] },
+ { "source": "scope-83", "targets": [ "scope-86" ] },
+ { "source": "scope-86", "targets": [ "scope-103" ] }
+ ]
+ }
+ },
+ "workflowTags": ""
+ },
+ {
+ "workflowId": "yarn_1371140159837_0001",
+ "workflowName": "yarnservicecheck",
+ "userName": "hdfs",
+ "startTime": 1371140224391,
+ "elapsedTime": 9523,
+ "inputBytes": 0,
+ "outputBytes": 0,
+ "numJobsTotal": 1,
+ "numJobsCompleted": 1,
+ "workflowContext": {
+ "workflowDag": {
+ "entries": [
+ { "source": "1", "targets": [] }
+ ]
+ }
+ }
}
],
"summary": {
- "numRows": 4,
+ "numRows": 6,
"jobs": {
"avg": 1,
"min": 1,
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/classes/run_class.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/classes/run_class.js?rev=1492883&r1=1492882&r2=1492883&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/classes/run_class.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/classes/run_class.js Thu Jun 13 22:02:21 2013
@@ -99,6 +99,9 @@ App.Run2 = Ember.Object.extend({
if (this.get('id').indexOf('mr_') === 0 || this.get('id').indexOf('mapreduce_') === 0) {
return 'MapReduce';
}
+ if (this.get('id').indexOf('yarn_') === 0) {
+ return 'Yarn';
+ }
return 'Undefined';
}.property('id')
});
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/apps_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/apps_controller.js?rev=1492883&r1=1492882&r2=1492883&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/apps_controller.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/apps_controller.js Thu Jun 13 22:02:21 2013
@@ -124,6 +124,8 @@ App.MainAppsController = Em.ArrayControl
this.set("sSearch_2","hive");
}else if(this.runType == "Pig"){
this.set("sSearch_2","pig");
+ }else if(this.runType == "Yarn"){
+ this.set("sSearch_2","yarn");
}else{
this.set("sSearch_2","");
}
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=1492883&r1=1492882&r2=1492883&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 Thu Jun 13 22:02:21 2013
@@ -91,8 +91,8 @@ module.exports = {
// nodeHeight = 40, labelFontSize = 20, maxLabelWidth = 260
// nodeHeight = 30, labelFontSize = 16
var nodeHeight = nodeHeight || 26;
- var labelFontSize = labelFontSize || 14;
- var maxLabelWidth = maxLabelWidth || 165;
+ var labelFontSize = labelFontSize || 12;
+ var maxLabelWidth = maxLabelWidth || 180;
var axisPadding = axisPadding || 30;
var stageFontSize = stageFontSize || 16;
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js?rev=1492883&r1=1492882&r2=1492883&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js Thu Jun 13 22:02:21 2013
@@ -175,7 +175,7 @@ App.MainAppsView = Em.View.extend({
typeFilterView: filters.createSelectView({
fieldType: 'input-small',
valueBinding: "controller.filterObject.runType",
- content: ['Any', 'Pig', 'Hive', 'MapReduce']
+ content: ['Any', 'Pig', 'Hive', 'MapReduce', 'Yarn']
}),
/**