AMBARI-1641 - Some map and reduce task metrics are missing for the tasktrackers in the API.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1456707 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -493,6 +493,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1641. Some map and reduce task metrics are missing for the
+ tasktrackers in the API. (tbeerbower)
+
  AMBARI-1640. Erroneos property is not highlighted while landing on step7
  of Installer wizard. (jaimin)
 

ambari-server/src/main/resources/jmx_properties.json

@@ -5161,42 +5161,42 @@
         "temporal":false
       },
       "metrics/mapred/tasktracker/maps_running":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.maps_running",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.maps_running",
         "pointInTime" : true,
         "temporal" : false
       },
       "metrics/mapred/tasktracker/reduces_running":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.reduces_running",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.reduces_running",
         "pointInTime" : true,
         "temporal" : false
       },
       "metrics/mapred/tasktracker/mapTaskSlots":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.mapTaskSlots",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.mapTaskSlots",
         "pointInTime" : true,
         "temporal" : false
       },
       "metrics/mapred/tasktracker/reduceTaskSlots":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.reduceTaskSlots",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.reduceTaskSlots",
         "pointInTime" : true,
         "temporal" : false
       },
       "metrics/mapred/tasktracker/failedDirs":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.failedDirs",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.failedDirs",
         "pointInTime" : true,
         "temporal" : false
       },
       "metrics/mapred/tasktracker/tasks_completed":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.tasks_completed",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.tasks_completed",
         "pointInTime" : true,
         "temporal" : false
       },
       "metrics/mapred/tasktracker/tasks_failed_timeout":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.tasks_failed_timeout",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.tasks_failed_timeout",
         "pointInTime" : true,
         "temporal" : false
       },
       "metrics/mapred/tasktracker/tasks_failed_ping":{
-        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerInfo.tasks_failed_ping",
+        "metric" : "Hadoop:service=TaskTracker,name=TaskTrackerMetrics.tasks_failed_ping",
         "pointInTime" : true,
         "temporal" : false
       },

ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java

@@ -147,6 +147,14 @@ public class JMXPropertyProviderTest {
     properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs"));
     properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes"));
     properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping"));
 
     request = PropertyHelper.getReadRequest(properties);
 
@@ -154,7 +162,7 @@ public class JMXPropertyProviderTest {
 
     Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-14-ee-b3.compute-1.internal", "50060"), streamProvider.getLastSpec());
 
-    Assert.assertEquals(10, PropertyHelper.getProperties(resource).size());
+    Assert.assertEquals(18, PropertyHelper.getProperties(resource).size());
     Assert.assertEquals(954466304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
     Assert.assertEquals(18330984, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
     Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
@@ -163,6 +171,15 @@ public class JMXPropertyProviderTest {
     Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs")));
     Assert.assertEquals(1841, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes")));
     Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running")));
+    Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots")));
+    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs")));
+    Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping")));
+
 
     Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
 

ambari-server/src/test/resources/mapreduce_tasktracker_jmx.json

@@ -508,14 +508,14 @@
     "tag.context" : "mapred",
     "tag.sessionId" : "",
     "tag.hostName" : "ip-10-85-111-149.ec2.internal",
-    "maps_running" : 0,
-    "reduces_running" : 0,
+    "maps_running" : 1,
+    "reduces_running" : 1,
     "mapTaskSlots" : 4,
     "reduceTaskSlots" : 2,
-    "failedDirs" : 0,
+    "failedDirs" : 1,
     "tasks_completed" : 4,
-    "tasks_failed_timeout" : 0,
-    "tasks_failed_ping" : 0
+    "tasks_failed_timeout" : 1,
+    "tasks_failed_ping" : 1
   }, {
     "name" : "Hadoop:service=TaskTracker,name=MetricsSystem,sub=Stats",
     "modelerType" : "MetricsSystem,sub=Stats",
@@ -839,4 +839,4 @@
     "ImplementationVersion" : "1.6.0_31-b04",
     "ImplementationVendor" : "Sun Microsystems"
   } ]
-}
+}