ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject git commit: AMBARI-3149. Ambari dashboard shows incorrect value for waiting and running Jobs. (srimanth)
Date Tue, 10 Sep 2013 01:03:10 GMT
Updated Branches:
  refs/heads/trunk ff7239392 -> c35d8ae4f


AMBARI-3149. Ambari dashboard shows incorrect value for waiting and running Jobs. (srimanth)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/c35d8ae4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c35d8ae4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c35d8ae4

Branch: refs/heads/trunk
Commit: c35d8ae4fb8c036ef33c0552223ea0d7256a7a1a
Parents: ff72393
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Mon Sep 9 18:00:13 2013 -0700
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Mon Sep 9 18:00:20 2013 -0700

----------------------------------------------------------------------
 ambari-web/app/mappers/service_mapper.js                 |  1 +
 ambari-web/app/messages.js                               |  2 +-
 ambari-web/app/models/service/mapreduce.js               |  1 +
 ambari-web/app/views/main/dashboard/service/mapreduce.js | 10 ++++++----
 4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c35d8ae4/ambari-web/app/mappers/service_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_mapper.js b/ambari-web/app/mappers/service_mapper.js
index 3a5414e..9956481 100644
--- a/ambari-web/app/mappers/service_mapper.js
+++ b/ambari-web/app/mappers/service_mapper.js
@@ -129,6 +129,7 @@ App.servicesMapper = App.QuickDataMapper.create({
     reduce_slots: 'reduce_slots',
     jobs_submitted: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_submitted',
     jobs_completed: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_completed',
+    jobs_running: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_running',
     map_slots_occupied: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.occupied_map_slots',
     map_slots_reserved: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.reserved_map_slots',
     reduce_slots_occupied: 'jobTrackerComponent.ServiceComponentInfo.jobtracker.occupied_reduce_slots',

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c35d8ae4/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5156262..72c9c05 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1337,7 +1337,7 @@ Em.I18n.translations = {
   'dashboard.services.yarn.queues': 'Queues',
   'dashboard.services.yarn.queues.msg': '{0} Queues',
 
-  'dashboard.services.mapreduce.summary':'{0} of {1} trackers live, {2} jobs running, {3}
jobs waiting',
+  'dashboard.services.mapreduce.summary':'{0} of {1} trackers live, {2} jobs running',
   'dashboard.services.mapreduce.taskTrackers':'TaskTrackers',
   'dashboard.services.mapreduce.taskTrackerCounts':'TaskTrackers Status',
   'dashboard.services.mapreduce.trackers':'Trackers',

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c35d8ae4/ambari-web/app/models/service/mapreduce.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service/mapreduce.js b/ambari-web/app/models/service/mapreduce.js
index e588f09..506f15d 100644
--- a/ambari-web/app/models/service/mapreduce.js
+++ b/ambari-web/app/models/service/mapreduce.js
@@ -31,6 +31,7 @@ App.MapReduceService = App.Service.extend({
   reduceSlots: DS.attr('number'),
   jobsSubmitted: DS.attr('number'),
   jobsCompleted: DS.attr('number'),
+  jobsRunning: DS.attr('number'),
   mapSlotsOccupied: DS.attr('number'),
   mapSlotsReserved: DS.attr('number'),
   reduceSlotsOccupied: DS.attr('number'),

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c35d8ae4/ambari-web/app/views/main/dashboard/service/mapreduce.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/service/mapreduce.js b/ambari-web/app/views/main/dashboard/service/mapreduce.js
index d3f3b2b..2a9b04a 100644
--- a/ambari-web/app/views/main/dashboard/service/mapreduce.js
+++ b/ambari-web/app/views/main/dashboard/service/mapreduce.js
@@ -50,11 +50,13 @@ App.MainDashboardServiceMapreduceView = App.MainDashboardServiceView.extend({
     var svc = this.get('service');
     var liveCount = svc.get('aliveTrackers').get('length');
     var allCount = svc.get('taskTrackers').get('length');
-    var runningCount = svc.get('mapsRunning') + svc.get('reducesRunning');
-    var waitingCount = svc.get('mapsWaiting') + svc.get('reducesWaiting');
+    var runningCount = svc.get('jobsRunning');
+    if (runningCount === null) {
+      runningCount = 'n/a';
+    }
     var template = this.t('dashboard.services.mapreduce.summary');
-    return template.format(liveCount, allCount, runningCount, waitingCount);
-  }.property('service.aliveTrackers', 'service.taskTrackers','service.mapsRunning', 'service.mapsWaiting',
'service.reducesRunning', 'service.reducesWaiting'),
+    return template.format(liveCount, allCount, runningCount);
+  }.property('service.aliveTrackers', 'service.taskTrackers', 'service.jobsRunning'),
 
   trackersText: function () {
     if(this.get('service').get('taskTrackers').get('length') > 1){


Mime
View raw message