Author: yusaku
Date: Wed Jun 19 18:17:47 2013
New Revision: 1494722
URL: http://svn.apache.org/r1494722
Log:
AMBARI-2432. Jobs page: input and output values are always shown as 0. (Oleg
Nechiporenko via yusaku)
Modified:
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/models/job.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/run.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps/list_row.hbs
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js
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=1494722&r1=1494721&r2=1494722&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
Wed Jun 19 18:17:47 2013
@@ -89,10 +89,6 @@ App.MainAppsController = Em.ArrayControl
sSearch_3:"",
minJobs:"",
maxJobs:"",
- minInputBytes:"",
- maxInputBytes:"",
- minOutputBytes:"",
- maxOutputBytes:"",
minDuration:"",
maxDuration:"",
minStartTime:"",
@@ -142,26 +138,6 @@ App.MainAppsController = Em.ArrayControl
}.observes("jobs"),
/**
- * Direct binding to Input filter field
- */
- input:"",
- onInputChange:function(){
- var minMaxTmp = this.parseBandWidth(this.input);
- this.set("minInputBytes", minMaxTmp.min);
- this.set("maxInputBytes", minMaxTmp.max);
- }.observes("input"),
-
- /**
- * Direct binding to Output filter field
- */
- output:"",
- onOutputChange:function(){
- var minMaxTmp = this.parseBandWidth(this.output);
- this.set("minOutputBytes", minMaxTmp.min);
- this.set("maxOutputBytes", minMaxTmp.max);
- }.observes("output"),
-
- /**
* Direct binding to Duration filter field
*/
duration:"",
@@ -327,8 +303,7 @@ App.MainAppsController = Em.ArrayControl
var arr = [
"sSearch_0", "sSearch_1", "sSearch_2", "sSearch_3", "minJobs",
- "maxJobs", "minInputBytes", "maxInputBytes", "minOutputBytes",
- "maxOutputBytes", "minDuration", "maxDuration", "minStartTime",
+ "maxJobs", "minDuration", "maxDuration", "minStartTime",
"maxStartTime", "sSearch", "iDisplayLength", "iDisplayStart",
"iSortCol_0", "sSortDir_0", "tagSearch"
];
@@ -366,8 +341,6 @@ App.MainAppsController = Em.ArrayControl
obj.set("sSearch_3","");
obj.set("runType","Any");
obj.set("jobs","");
- obj.set("input","");
- obj.set("output","");
obj.set("duration","");
obj.set("runDate","Any");
obj.set("tagSearch","");
@@ -407,10 +380,6 @@ App.MainAppsController = Em.ArrayControl
'filterObject.sSearch_3',
'filterObject.minJobs',
'filterObject.maxJobs',
- 'filterObject.minInputBytes',
- 'filterObject.maxInputBytes',
- 'filterObject.minOutputBytes',
- 'filterObject.maxOutputBytes',
'filterObject.minDuration',
'filterObject.maxDuration',
'filterObject.minStartTime',
@@ -440,16 +409,6 @@ App.MainAppsController = Em.ArrayControl
'min': '-',
'max': '-'
},
- 'input': {
- 'avg': '-',
- 'min': '-',
- 'max': '-'
- },
- 'output': {
- 'avg': '-',
- 'min': '-',
- 'max': '-'
- },
'duration': {
'avg': '-',
'min': '-',
@@ -467,16 +426,6 @@ App.MainAppsController = Em.ArrayControl
'min': summary.jobs.min,
'max': summary.jobs.max
},
- 'input': {
- 'avg': misc.formatBandwidth(summary.input.avg),
- 'min': misc.formatBandwidth(summary.input.min),
- 'max': misc.formatBandwidth(summary.input.max)
- },
- 'output': {
- 'avg': misc.formatBandwidth(summary.output.avg),
- 'min': misc.formatBandwidth(summary.output.min),
- 'max': misc.formatBandwidth(summary.output.max)
- },
'duration': {
'avg': date.timingFormat(Math.round(summary.duration.avg)),
'min': date.timingFormat(summary.duration.min),
@@ -500,10 +449,8 @@ App.MainAppsController = Em.ArrayControl
{ name: Em.I18n.t('common.user'), index: 3 },
{ name: Em.I18n.t('common.tags'), index: 4 },
{ name: Em.I18n.t('apps.avgTable.jobs'), index: 5 },
- { name: Em.I18n.t('apps.avgTable.input'), index: 6 },
- { name: Em.I18n.t('apps.avgTable.output'), index: 7 },
- { name: Em.I18n.t('apps.avgTable.duration'), index: 8 },
- { name: Em.I18n.t('apps.table.column.runDate'), index: 9 }
+ { name: Em.I18n.t('apps.avgTable.duration'), index: 6 },
+ { name: Em.I18n.t('apps.table.column.runDate'), index: 7 }
]
})
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/job.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/job.js?rev=1494722&r1=1494721&r2=1494722&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/job.js
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/job.js Wed Jun
19 18:17:47 2013
@@ -33,28 +33,12 @@ App.Job = DS.Model.extend({
maps: DS.attr('number'),
reduces: DS.attr('number'),
status: DS.attr('string'),
- input: DS.attr('number'),
- output: DS.attr('number'),
elapsedTime: DS.attr('number'),
duration: function () {
return date.timingFormat(parseInt(this.get('elapsedTime')));
}.property('elapsedTime'),
jobTimeLine: DS.attr('string'),
- jobTaskView: DS.attr('string'),
- /**
- * Sum of input bandwidth for all jobs with appropriate measure
- */
- inputFormatted: function () {
- var input = this.get('input');
- return misc.formatBandwidth(input);
- }.property('input'),
- /**
- * Sum of output bandwidth for all jobs with appropriate measure
- */
- outputFormatted: function () {
- var output = this.get('output');
- return misc.formatBandwidth(output);
- }.property('output')
+ jobTaskView: DS.attr('string')
});
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/run.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/run.js?rev=1494722&r1=1494721&r2=1494722&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/run.js
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/models/run.js Wed Jun
19 18:17:47 2013
@@ -30,8 +30,6 @@ App.Run = DS.Model.extend({
startTime:DS.attr('string'),
elapsedTime:DS.attr('string'),
workflowContext:DS.attr('string'),
- input: DS.attr('number'),
- output: DS.attr('number'),
tags: DS.attr('string'),
loadAllJobs : false,
@@ -65,23 +63,6 @@ App.Run = DS.Model.extend({
isRunning: function () {
return !this.get('numJobsTotal') == this.get('numJobsCompleted');
}.property('numJobsTotal', 'numJobsCompleted'),
- /**
- * Sum of input bandwidth for all jobs with appropriate measure
- */
- inputFormatted: function () {
- var input = this.get('input');
- input = misc.formatBandwidth(input);
- return input;
- }.property('input'),
-
- /**
- * Sum of output bandwidth for all jobs with appropriate measure
- */
- outputFormatted: function () {
- var output = this.get('output');
- output = misc.formatBandwidth(output);
- return output;
- }.property('output'),
/**
*
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs?rev=1494722&r1=1494721&r2=1494722&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs
Wed Jun 19 18:17:47 2013
@@ -22,8 +22,6 @@
<tr>
<td></td>
<td>{{t apps.avgTable.jobs}}</td>
- <td>{{t apps.avgTable.input}}</td>
- <td>{{t apps.avgTable.output}}</td>
<td>{{t apps.avgTable.duration}}</td>
<td>{{t apps.avgTable.oldest}}</td>
<td>{{t apps.avgTable.mostRecent}}</td>
@@ -31,8 +29,6 @@
<tr class="avg-info">
<td>{{t apps.avgTable.avg}}</td>
<td>{{summary.jobs.avg}}</td>
- <td>{{summary.input.avg}}</td>
- <td>{{summary.output.avg}}</td>
<td>{{summary.duration.avg}}</td>
<td>{{summary.times.oldest}}</td>
<td>{{summary.times.youngest}}</td>
@@ -41,8 +37,6 @@
<tr class="compare-info">
<td>{{t apps.avgTable.min}} / {{t apps.avgTable.max}}</td>
<td>{{summary.jobs.min}} / {{summary.jobs.max}}</td>
- <td>{{summary.input.min}} / {{summary.input.max}}</td>
- <td>{{summary.output.min}} / {{summary.output.max}}</td>
<td>{{summary.duration.min}} / {{summary.duration.max}}</td>
<td></td>
<td></td>
@@ -82,8 +76,6 @@
<th>{{view view.userFilterView}}</th>
<th>{{view view.tagFilterView}}</th>
<th>{{view view.jobsFilterView}}</th>
- <th>{{view view.inputFilterView}}</th>
- <th>{{view view.outputFilterView}}</th>
<th>{{view view.durationFilterView}}</th>
<th>{{view view.runDateFilterView}}</th>
</tr>
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps/list_row.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps/list_row.hbs?rev=1494722&r1=1494721&r2=1494722&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps/list_row.hbs
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps/list_row.hbs
Wed Jun 19 18:17:47 2013
@@ -22,8 +22,6 @@
<td>{{unbound run.userName}}</td>
<td>{{unbound run.tags}}</td>
<td>{{unbound run.numJobsTotal}}</td>
-<td>{{unbound run.inputFormatted}}</td>
-<td>{{unbound run.outputFormatted}}</td>
<td>{{unbound run.duration}}</td>
{{#if run.isRunning}}
<td rel="popover" {{translateAttr title="apps.isRunning.popup.title"
data-content="apps.isRunning.popup.content"}}>
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=1494722&r1=1494721&r2=1494722&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
Wed Jun 19 18:17:47 2013
@@ -225,22 +225,6 @@ App.MainAppsView = Em.View.extend({
valueBinding: "controller.filterObject.jobs"
}),
/**
- * Filter-field for Input.
- * Based on <code>filters</code> library
- */
- inputFilterView: filters.createTextView({
- fieldType: 'input-super-mini',
- valueBinding: "controller.filterObject.input"
- }),
- /**
- * Filter-field for Output.
- * Based on <code>filters</code> library
- */
- outputFilterView: filters.createTextView({
- fieldType: 'input-super-mini',
- valueBinding: "controller.filterObject.output"
- }),
- /**
* Filter-field for Duration.
* Based on <code>filters</code> library
*/
