svn commit: r1418964 - in /incubator/ambari/branches/AMBARI-666: AMBARI-666-CHANGES.txt ambari-web/app/mappers/services_mapper.js

[yu...@apache.org]

Author: yusaku
Date: Sun Dec  9 14:07:52 2012
New Revision: 1418964

URL: http://svn.apache.org/viewvc?rev=1418964&view=rev
Log:
AMBARI-1028. MapReduce & HDFS summaries should use ServiceComponentInfo values. (Srimanth Gunturi via yusaku)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js

Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1418964&r1=1418963&r2=1418964&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Sun Dec  9 14:07:52 2012
@@ -484,6 +484,9 @@ AMBARI-666 branch (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+ 
+  AMBARI-1028. MapReduce & HDFS summaries should use ServiceComponentInfo
+  values. (Srimanth Gunturi via yusaku)
 
   AMBARI-1017. Alerts not showing up in Ambari UI due to model refactoring.
   (Srimanth Gunturi via yusaku)

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js?rev=1418964&r1=1418963&r2=1418964&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js Sun Dec  9 14:07:52 2012
@@ -66,11 +66,11 @@ App.servicesMapper = App.QuickDataMapper
     decommision_data_nodes:'decommission_data_nodes',
     capacity_used:'nameNodeComponent.ServiceComponentInfo.CapacityUsed',
     capacity_total:'nameNodeComponent.ServiceComponentInfo.CapacityTotal',
-    dfs_total_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.BlocksTotal',
-    dfs_corrupt_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CorruptBlocks',
-    dfs_missing_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.MissingBlocks',
-    dfs_under_replicated_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.UnderReplicatedBlocks',
-    dfs_total_files:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.FilesTotal',
+    dfs_total_blocks:'nameNodeComponent.ServiceComponentInfo.BlocksTotal',
+    dfs_corrupt_blocks:'nameNodeComponent.ServiceComponentInfo.CorruptBlocks',
+    dfs_missing_blocks:'nameNodeComponent.ServiceComponentInfo.MissingBlocks',
+    dfs_under_replicated_blocks:'nameNodeComponent.ServiceComponentInfo.UnderReplicatedBlocks',
+    dfs_total_files:'nameNodeComponent.ServiceComponentInfo.TotalFiles',
     upgrade_status:'nameNodeComponent.ServiceComponentInfo.UpgradeFinalized',
     safe_mode_status:'nameNodeComponent.ServiceComponentInfo.Safemode'
   },
@@ -87,16 +87,16 @@ App.servicesMapper = App.QuickDataMapper
     gray_list_trackers:'gray_list_trackers',
     map_slots:'map_slots',
     reduce_slots:'reduce_slots',
-    jobs_submitted:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_submitted',
-    jobs_completed:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_completed',
-    map_slots_occupied:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_map_slots',
-    map_slots_reserved:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_map_slots',
-    reduce_slots_occupied:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_reduce_slots',
-    reduce_slots_reserved:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_reduce_slots',
-    maps_running:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_maps',
-    maps_waiting:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_maps',
-    reduces_running:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_reduces',
-    reduces_waiting:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_reduces',
+    jobs_submitted:'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_submitted',
+    jobs_completed:'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_completed',
+    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',
+    reduce_slots_reserved:'jobTrackerComponent.ServiceComponentInfo.jobtracker.reserved_reduce_slots',
+    maps_running:'jobTrackerComponent.ServiceComponentInfo.jobtracker.running_maps',
+    maps_waiting:'jobTrackerComponent.ServiceComponentInfo.jobtracker.waiting_maps',
+    reduces_running:'jobTrackerComponent.ServiceComponentInfo.jobtracker.running_reduces',
+    reduces_waiting:'jobTrackerComponent.ServiceComponentInfo.jobtracker.waiting_reduces',
     trackers_decommisioned:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.trackers_decommissioned'
   },