incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject svn commit: r1464653 - in /incubator/ambari/trunk: ./ ambari-server/src/main/resources/ ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/ ambari-server/src/test/resources/
Date Thu, 04 Apr 2013 17:46:29 GMT
Author: tbeerbower
Date: Thu Apr  4 17:46:29 2013
New Revision: 1464653

URL: http://svn.apache.org/r1464653
Log:
AMBARI-1674. Jobtracker metric for maps_completed shows wrong value

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-server/src/main/resources/jmx_properties.json
    incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
    incubator/ambari/trunk/ambari-server/src/test/resources/mapreduce_jobtracker_jmx.json

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1464653&r1=1464652&r2=1464653&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr  4 17:46:29 2013
@@ -549,6 +549,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1674. Jobtracker metric for maps_completed shows wrong value
+ (tbeerbower)
+
  AMBARI-1786. Ambari server start fail after reset. (smohanty)
 
  AMBARI-1784. MapReduce service damaging after hadoop installation with 

Modified: incubator/ambari/trunk/ambari-server/src/main/resources/jmx_properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/jmx_properties.json?rev=1464653&r1=1464652&r2=1464653&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/jmx_properties.json (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/jmx_properties.json Thu Apr  4
17:46:29 2013
@@ -998,7 +998,7 @@
         "temporal" : false
       },
       "metrics/mapred/jobtracker/maps_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_launched",
+        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_completed",
         "pointInTime" : true,
         "temporal" : false
       },
@@ -4644,7 +4644,7 @@
         "temporal" : false
       },
       "metrics/mapred/jobtracker/maps_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_launched",
+        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_completed",
         "pointInTime" : true,
         "temporal" : false
       },

Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java?rev=1464653&r1=1464652&r2=1464653&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
(original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
Thu Apr  4 17:46:29 2013
@@ -111,6 +111,9 @@ public class JMXPropertyProviderTest {
     properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_submitted"));
     properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_completed"));
     properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_failed"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_launched"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_completed"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_failed"));
 
     request = PropertyHelper.getReadRequest(properties);
 
@@ -119,7 +122,7 @@ public class JMXPropertyProviderTest {
     Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-14-ee-b3.compute-1.internal",
"50030"), streamProvider.getLastSpec());
 
     // see test/resources/mapreduce_jobtracker_jmx.json for values
-    Assert.assertEquals(10, PropertyHelper.getProperties(resource).size());
+    Assert.assertEquals(13, PropertyHelper.getProperties(resource).size());
     Assert.assertEquals(59, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm",
"threadsWaiting")));
     Assert.assertEquals(1052770304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm",
"HeapMemoryMax")));
     Assert.assertEquals(43580400, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm",
"HeapMemoryUsed")));
@@ -128,6 +131,9 @@ public class JMXPropertyProviderTest {
     Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker",
"jobs_submitted")));
     Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker",
"jobs_completed")));
     Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker",
"jobs_failed")));
+    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker",
"maps_launched")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker",
"maps_completed")));
+    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker",
"maps_failed")));
 
     Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm",
"gcCount")));
 

Modified: incubator/ambari/trunk/ambari-server/src/test/resources/mapreduce_jobtracker_jmx.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/resources/mapreduce_jobtracker_jmx.json?rev=1464653&r1=1464652&r2=1464653&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/resources/mapreduce_jobtracker_jmx.json
(original)
+++ incubator/ambari/trunk/ambari-server/src/test/resources/mapreduce_jobtracker_jmx.json
Thu Apr  4 17:46:29 2013
@@ -270,7 +270,7 @@
     "tag.sessionId" : "",
     "tag.Queue" : "default",
     "tag.hostName" : "ip-10-116-103-5.ec2.internal",
-    "maps_launched" : 1,
+    "maps_launched" : 2,
     "maps_completed" : 1,
     "maps_failed" : 0,
     "reduces_launched" : 1,
@@ -371,7 +371,7 @@
     "reduce_slots" : 2,
     "blacklisted_maps" : 0,
     "blacklisted_reduces" : 0,
-    "maps_launched" : 1,
+    "maps_launched" : 2,
     "maps_completed" : 1,
     "maps_failed" : 0,
     "reduces_launched" : 1,
@@ -894,4 +894,4 @@
     "ImplementationVersion" : "1.6.0_31-b04",
     "ImplementationVendor" : "Sun Microsystems"
   } ]
-}
\ No newline at end of file
+}



Mime
View raw message