ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-11665. AMS : IllegalArgumentException populating metrics for host with no cluster association. Unit test fixed. (swagle)
Date Wed, 03 Jun 2015 21:53:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 414dbe008 -> 01f702976


AMBARI-11665. AMS : IllegalArgumentException populating metrics for host with no cluster association.
Unit test fixed. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01f70297
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01f70297
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01f70297

Branch: refs/heads/trunk
Commit: 01f70297665b92c031c774fbc438f700fb2507cf
Parents: 414dbe0
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Wed Jun 3 14:53:06 2015 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Wed Jun 3 14:53:27 2015 -0700

----------------------------------------------------------------------
 .../metrics/timeline/AMSPropertyProviderTest.java           | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/01f70297/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
index 923f2f7..e7146d1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
@@ -97,6 +97,7 @@ public class AMSPropertyProviderTest {
     );
 
     Resource resource = new ResourceImpl(Resource.Type.Host);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
     temporalInfoMap.put(PROPERTY_ID1, new TemporalInfoImpl(1416445244701L, 1416445244901L,
1L));
@@ -137,6 +138,7 @@ public class AMSPropertyProviderTest {
     );
 
     Resource resource = new ResourceImpl(Resource.Type.Host);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     Map<String, TemporalInfo> temporalInfoMap = Collections.emptyMap();
     Request request = PropertyHelper.getReadRequest(Collections.singleton
@@ -179,6 +181,7 @@ public class AMSPropertyProviderTest {
     );
 
     Resource resource = new ResourceImpl(Resource.Type.Host);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     Map<String, TemporalInfo> temporalInfoMap = Collections.emptyMap();
     Request request = PropertyHelper.getReadRequest(
@@ -224,6 +227,7 @@ public class AMSPropertyProviderTest {
     );
 
     Resource resource = new ResourceImpl(Resource.Type.Host);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
     temporalInfoMap.put(PROPERTY_ID1, new TemporalInfoImpl(1416445244701L, 1416445244901L,
1L));
@@ -284,6 +288,7 @@ public class AMSPropertyProviderTest {
 
     String propertyId1 = "metrics/yarn/Queue/root/AvailableMB";
     Resource resource = new ResourceImpl(Resource.Type.Component);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -327,6 +332,7 @@ public class AMSPropertyProviderTest {
 
     String propertyId = PropertyHelper.getPropertyId("metrics/rpc", "RpcQueueTime_avg_time");
     Resource resource = new ResourceImpl(Resource.Type.Component);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "NAMENODE");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -392,6 +398,7 @@ public class AMSPropertyProviderTest {
 
     String propertyId = PropertyHelper.getPropertyId("metrics/hbase/regionserver", "requests");
     Resource resource = new ResourceImpl(Resource.Type.Component);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "METRICS_COLLECTOR");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -458,6 +465,7 @@ public class AMSPropertyProviderTest {
 
     String propertyId = PropertyHelper.getPropertyId("metrics/rpc", "NumOpenConnections._sum");
     Resource resource = new ResourceImpl(Resource.Type.Component);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "HBASE_REGIONSERVER");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
     temporalInfoMap.put(propertyId, new TemporalInfoImpl(1429824611300L, 1429825241400L,
1L));
@@ -526,6 +534,7 @@ public class AMSPropertyProviderTest {
     );
 
     Resource resource = new ResourceImpl(Resource.Type.Host);
+    resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "DATANODE");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();


Mime
View raw message