svn commit: r1490780 - in /incubator/ambari/branches/branch-1.4.0/ambari-web/app: controllers/global/update_controller.js mappers/service_mapper.js

[sr...@apache.org]

Author: srimanth
Date: Fri Jun  7 18:52:30 2013
New Revision: 1490780

URL: http://svn.apache.org/r1490780
Log:
AMBARI-2323. YARN service summary shows incorrect App & Container values (API values moved around). (srimanth)

Modified:
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/update_controller.js
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/update_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/update_controller.js?rev=1490780&r1=1490779&r2=1490780&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/update_controller.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/update_controller.js Fri Jun  7 18:52:30 2013
@@ -80,7 +80,7 @@ App.UpdateController = Em.Controller.ext
     self.set('isUpdated', false);
     var servicesUrl = isInitialLoad ? 
         this.getUrl('/data/dashboard/services.json', '/services?fields=components/ServiceComponentInfo,components/host_components,components/host_components/HostRoles') : 
-        this.getUrl('/data/dashboard/services.json', '/services?fields=components/ServiceComponentInfo,components/host_components,components/host_components/HostRoles,components/host_components/metrics/jvm/memHeapUsedM,components/host_components/metrics/jvm/memHeapCommittedM,components/host_components/metrics/mapred/jobtracker/trackers_decommissioned');
+        this.getUrl('/data/dashboard/services.json', '/services?fields=components/ServiceComponentInfo,components/host_components,components/host_components/HostRoles,components/host_components/metrics/jvm/memHeapUsedM,components/host_components/metrics/jvm/memHeapCommittedM,components/host_components/metrics/mapred/jobtracker/trackers_decommissioned,components/host_components/metrics/yarn/Queue');
     var callback = callback || function (jqXHR, textStatus) {
       self.set('isUpdated', true);
     };

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js?rev=1490780&r1=1490779&r2=1490780&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js Fri Jun  7 18:52:30 2013
@@ -87,15 +87,15 @@ App.servicesMapper = App.QuickDataMapper
     resource_manager_start_time: 'resourceManagerComponent.ServiceComponentInfo.StartTime',
     jvm_memory_heap_used: 'resourceManagerComponent.host_components[0].metrics.jvm.memHeapUsedM',
     jvm_memory_heap_committed: 'resourceManagerComponent.host_components[0].metrics.jvm.memHeapCommittedM',
-    containers_allocated: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.AllocatedContainers',
-    containers_pending: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.PendingContainers',
-    containers_reserved: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.ReservedContainers',
-    apps_submitted: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.AppsSubmitted',
-    apps_running: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.AppsRunning',
-    apps_pending: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.AppsPending',
-    apps_completed: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.AppsCompleted',
-    apps_killed: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.AppsKilled',
-    apps_failed: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.yarn.Queue.AppsFailed',
+    containers_allocated: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.AllocatedContainers',
+    containers_pending: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.PendingContainers',
+    containers_reserved: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.ReservedContainers',
+    apps_submitted: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.AppsSubmitted',
+    apps_running: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.AppsRunning',
+    apps_pending: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.AppsPending',
+    apps_completed: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.AppsCompleted',
+    apps_killed: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.AppsKilled',
+    apps_failed: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.AppsFailed',
     node_managers_count_active: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.cluster.activeNMcount',
     node_managers_count_lost: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.cluster.lostNMcount',
     node_managers_count_unhealthy: 'resourceManagerComponent.ServiceComponentInfo.rm_metrics.cluster.unhealthyNMcount',