Author: tbeerbower
Date: Thu Mar 7 21:32:32 2013
New Revision: 1454109
URL: http://svn.apache.org/r1454109
Log:
AMBARI-1559. Jobs failed count always returns 0 in the jobtracker API metrics.
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json
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/java/org/apache/ambari/server/controller/utilities/PropertyHelperTest.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=1454109&r1=1454108&r2=1454109&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Mar 7 21:32:32 2013
@@ -426,6 +426,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1559. Jobs failed count always returns 0 in the jobtracker API metrics.
+ (tbeerbower)
+
AMBARI-1577. Apply stage of security wizard throws javascript error
for loadStep function. (jaimin)
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json?rev=1454109&r1=1454108&r2=1454109&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json
Thu Mar 7 21:32:32 2013
@@ -4204,17 +4204,17 @@
},
"metrics/mapred/jobtracker/blacklisted_maps":{
"metric":"mapred.jobtracker.blacklisted_maps",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/blacklisted_reduces":{
"metric":"mapred.jobtracker.blacklisted_reduces",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/heartbeats":{
"metric":"mapred.jobtracker.heartbeats",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_completed":{
@@ -4224,17 +4224,17 @@
},
"metrics/mapred/jobtracker/jobs_failed":{
"metric":"mapred.jobtracker.jobs_failed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_killed":{
"metric":"mapred.jobtracker.jobs_killed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_preparing":{
"metric":"mapred.jobtracker.jobs_preparing",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_running":{
@@ -4249,27 +4249,27 @@
},
"metrics/mapred/jobtracker/map_slots":{
"metric":"mapred.jobtracker.map_slots",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_completed":{
"metric":"mapred.jobtracker.maps_completed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_failed":{
"metric":"mapred.jobtracker.maps_failed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_killed":{
"metric":"mapred.jobtracker.maps_killed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_launched":{
"metric":"mapred.jobtracker.maps_launched",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/occupied_map_slots":{
@@ -4284,27 +4284,27 @@
},
"metrics/mapred/jobtracker/reduce_slots":{
"metric":"mapred.jobtracker.reduce_slots",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_completed":{
"metric":"mapred.jobtracker.reduces_completed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_failed":{
"metric":"mapred.jobtracker.reduces_failed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_killed":{
"metric":"mapred.jobtracker.reduces_killed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_launched":{
"metric":"mapred.jobtracker.reduces_launched",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reserved_map_slots":{
@@ -4329,22 +4329,22 @@
},
"metrics/mapred/jobtracker/trackers":{
"metric":"mapred.jobtracker.trackers",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/trackers_blacklisted":{
"metric":"mapred.jobtracker.trackers_blacklisted",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/trackers_decommissioned":{
"metric":"mapred.jobtracker.trackers_decommissioned",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/trackers_graylisted":{
"metric":"mapred.jobtracker.trackers_graylisted",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/waiting_maps":{
@@ -6287,7 +6287,7 @@
},
"metrics/hbase/master/cluster_requests":{
"metric":"hbase.master.cluster_requests",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/hbase/master/splitSize_avg_time":{
@@ -13296,17 +13296,17 @@
},
"metrics/mapred/jobtracker/blacklisted_maps":{
"metric":"mapred.jobtracker.blacklisted_maps",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/blacklisted_reduces":{
"metric":"mapred.jobtracker.blacklisted_reduces",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/heartbeats":{
"metric":"mapred.jobtracker.heartbeats",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_completed":{
@@ -13316,17 +13316,17 @@
},
"metrics/mapred/jobtracker/jobs_failed":{
"metric":"mapred.jobtracker.jobs_failed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_killed":{
"metric":"mapred.jobtracker.jobs_killed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_preparing":{
"metric":"mapred.jobtracker.jobs_preparing",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/jobs_running":{
@@ -13341,27 +13341,27 @@
},
"metrics/mapred/jobtracker/map_slots":{
"metric":"mapred.jobtracker.map_slots",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_completed":{
"metric":"mapred.jobtracker.maps_completed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_failed":{
"metric":"mapred.jobtracker.maps_failed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_killed":{
"metric":"mapred.jobtracker.maps_killed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/maps_launched":{
"metric":"mapred.jobtracker.maps_launched",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/occupied_map_slots":{
@@ -13376,27 +13376,27 @@
},
"metrics/mapred/jobtracker/reduce_slots":{
"metric":"mapred.jobtracker.reduce_slots",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_completed":{
"metric":"mapred.jobtracker.reduces_completed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_failed":{
"metric":"mapred.jobtracker.reduces_failed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_killed":{
"metric":"mapred.jobtracker.reduces_killed",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reduces_launched":{
"metric":"mapred.jobtracker.reduces_launched",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/reserved_map_slots":{
@@ -13421,22 +13421,22 @@
},
"metrics/mapred/jobtracker/trackers":{
"metric":"mapred.jobtracker.trackers",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/trackers_blacklisted":{
"metric":"mapred.jobtracker.trackers_blacklisted",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/trackers_decommissioned":{
"metric":"mapred.jobtracker.trackers_decommissioned",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/trackers_graylisted":{
"metric":"mapred.jobtracker.trackers_graylisted",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/mapred/jobtracker/waiting_maps":{
@@ -15274,7 +15274,7 @@
},
"metrics/hbase/master/cluster_requests":{
"metric":"hbase.master.cluster_requests",
- "pointInTime":true,
+ "pointInTime":false,
"temporal":true
},
"metrics/hbase/master/splitSize_avg_time":{
@@ -19562,4 +19562,4 @@
}
}
}
-}
\ No newline at end of file
+}
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=1454109&r1=1454108&r2=1454109&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 Mar 7 21:32:32 2013
@@ -972,6 +972,106 @@
"pointInTime" : true,
"temporal" : false
},
+ "metrics/mapred/jobtracker/map_slots":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.map_slots",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduce_slots":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduce_slots",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/blacklisted_maps":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.blacklisted_maps",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/blacklisted_reduces":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.blacklisted_reduces",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_launched":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_launched",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_completed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_launched",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_failed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_failed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_launched":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_launched",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_completed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_completed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_failed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_failed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/jobs_failed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_failed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/jobs_killed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_killed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/jobs_preparing":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_preparing",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_killed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_killed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_killed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_killed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers":{
+ "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers_blacklisted":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_blacklisted",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers_graylisted":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_graylisted",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers_decommissioned":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_decommissioned",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/heartbeats":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.heartbeats",
+ "pointInTime" : true,
+ "temporal" : false
+ },
"metrics/mapred/jobtracker/occupied_map_slots":{
"metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.occupied_map_slots",
"pointInTime" : true,
@@ -4448,7 +4548,6 @@
"pointInTime" : true,
"temporal" : false
},
-
"metrics/mapred/Queue/jobs_completed":{
"metric" :
"Hadoop:service=JobTracker,name=QueueMetrics,q=default.jobs_completed",
"pointInTime" : true,
@@ -4519,6 +4618,106 @@
"pointInTime" : true,
"temporal" : false
},
+ "metrics/mapred/jobtracker/map_slots":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.map_slots",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduce_slots":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduce_slots",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/blacklisted_maps":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.blacklisted_maps",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/blacklisted_reduces":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.blacklisted_reduces",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_launched":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_launched",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_completed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_launched",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_failed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_failed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_launched":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_launched",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_completed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_completed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_failed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_failed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/jobs_failed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_failed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/jobs_killed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_killed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/jobs_preparing":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_preparing",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/maps_killed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_killed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/reduces_killed":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_killed",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers":{
+ "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers_blacklisted":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_blacklisted",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers_graylisted":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_graylisted",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/trackers_decommissioned":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_decommissioned",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/mapred/jobtracker/heartbeats":{
+ "metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.heartbeats",
+ "pointInTime" : true,
+ "temporal" : false
+ },
"metrics/mapred/jobtracker/occupied_map_slots":{
"metric" :
"Hadoop:service=JobTracker,name=JobTrackerMetrics.occupied_map_slots",
"pointInTime" : true,
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=1454109&r1=1454108&r2=1454109&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 Mar 7 21:32:32 2013
@@ -110,6 +110,7 @@ public class JMXPropertyProviderTest {
properties.add(PropertyHelper.getPropertyId("metrics/jvm",
"NonHeapMemoryUsed"));
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"));
request = PropertyHelper.getReadRequest(properties);
@@ -118,14 +119,15 @@ 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(9, PropertyHelper.getProperties(resource).size());
+ Assert.assertEquals(10, 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")));
Assert.assertEquals(136314880,
resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm",
"NonHeapMemoryMax")));
Assert.assertEquals(29602888,
resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm",
"NonHeapMemoryUsed")));
- Assert.assertEquals(1,
resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker",
"jobs_submitted")));
+ 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.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm",
"gcCount")));
Modified:
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/PropertyHelperTest.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/PropertyHelperTest.java?rev=1454109&r1=1454108&r2=1454109&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/PropertyHelperTest.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/PropertyHelperTest.java
Thu Mar 7 21:32:32 2013
@@ -17,12 +17,9 @@
*/
package org.apache.ambari.server.controller.utilities;
-import org.apache.ambari.server.controller.spi.Request;
import org.junit.Assert;
import org.junit.Test;
-import java.util.HashSet;
-import java.util.Set;
/**
* Property helper tests.
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=1454109&r1=1454108&r2=1454109&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 Mar 7 21:32:32 2013
@@ -377,7 +377,7 @@
"reduces_launched" : 1,
"reduces_completed" : 1,
"reduces_failed" : 0,
- "jobs_submitted" : 1,
+ "jobs_submitted" : 2,
"jobs_completed" : 1,
"waiting_maps" : 0,
"waiting_reduces" : 0,
@@ -385,7 +385,7 @@
"reserved_reduce_slots" : 0,
"occupied_map_slots" : 0,
"occupied_reduce_slots" : 0,
- "jobs_failed" : 0,
+ "jobs_failed" : 1,
"jobs_killed" : 0,
"jobs_preparing" : 0,
"jobs_running" : 0,
@@ -894,4 +894,4 @@
"ImplementationVersion" : "1.6.0_31-b04",
"ImplementationVendor" : "Sun Microsystems"
} ]
-}
\ No newline at end of file
+}
