Repository: ambari Updated Branches: refs/heads/trunk 6d196db0d -> 9e524d7e6
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e524d7e/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataManager.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataManager.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataManager.java index 21508ec..c4cf51d 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataManager.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataManager.java @@ -23,6 +23,7 @@ import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetricMetadata; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.AbstractMiniHBaseClusterTest; +import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.TimelineMetricsFilter; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators.AggregatorUtils; import org.junit.Before; import org.junit.Test; @@ -86,8 +87,9 @@ public class TestMetadataManager extends AbstractMiniHBaseClusterTest { }}); timelineMetrics.getMetrics().add(metric3); - AggregatorUtils.whitelistedMetrics.add("dummy_metric1"); - AggregatorUtils.whitelistedMetrics.add("dummy_metric2"); + TimelineMetricsFilter.initializeMetricFilter(new Configuration()); + TimelineMetricsFilter.addToWhitelist("dummy_metric1"); + TimelineMetricsFilter.addToWhitelist("dummy_metric2"); hdb.insertMetricRecordsWithMetadata(metadataManager, timelineMetrics, true); } @@ -97,16 +99,20 @@ public class TestMetadataManager extends AbstractMiniHBaseClusterTest { Map<TimelineMetricMetadataKey, TimelineMetricMetadata> cachedData = metadataManager.getMetadataCache(); Assert.assertNotNull(cachedData); - Assert.assertEquals(2, cachedData.size()); + Assert.assertEquals(3, cachedData.size()); TimelineMetricMetadataKey key1 = new TimelineMetricMetadataKey("dummy_metric1", "dummy_app1"); TimelineMetricMetadataKey key2 = new TimelineMetricMetadataKey("dummy_metric2", "dummy_app2"); + TimelineMetricMetadataKey key3 = new TimelineMetricMetadataKey("dummy_metric3", "dummy_app3"); TimelineMetricMetadata value1 = new TimelineMetricMetadata("dummy_metric1", - "dummy_app1", "Integer", null, 1L, true); + "dummy_app1", "Integer", null, 1L, true, false); TimelineMetricMetadata value2 = new TimelineMetricMetadata("dummy_metric2", - "dummy_app2", "Integer", null, 1L, true); + "dummy_app2", "Integer", null, 1L, true, false); + TimelineMetricMetadata value3 = new TimelineMetricMetadata("dummy_metric3", + "dummy_app3", "Integer", null, 1L, true, true); Assert.assertEquals(value1, cachedData.get(key1)); Assert.assertEquals(value2, cachedData.get(key2)); + Assert.assertEquals(value3, cachedData.get(key3)); TimelineMetricMetadataSync syncRunnable = new TimelineMetricMetadataSync(metadataManager); syncRunnable.run(); @@ -115,16 +121,19 @@ public class TestMetadataManager extends AbstractMiniHBaseClusterTest { hdb.getTimelineMetricMetadata(); Assert.assertNotNull(savedData); - Assert.assertEquals(2, savedData.size()); + Assert.assertEquals(3, savedData.size()); Assert.assertEquals(value1, savedData.get(key1)); Assert.assertEquals(value2, savedData.get(key2)); + Assert.assertEquals(value3, savedData.get(key3)); Map<String, Set<String>> cachedHostData = metadataManager.getHostedAppsCache(); Map<String, Set<String>> savedHostData = metadataManager.getHostedAppsFromStore(); Assert.assertEquals(cachedData.size(), savedData.size()); Assert.assertEquals("dummy_app1", cachedHostData.get("dummy_host1").iterator().next()); Assert.assertEquals("dummy_app2", cachedHostData.get("dummy_host2").iterator().next()); + Assert.assertEquals("dummy_app3", cachedHostData.get("dummy_host3").iterator().next()); Assert.assertEquals("dummy_app1", savedHostData.get("dummy_host1").iterator().next()); Assert.assertEquals("dummy_app2", savedHostData.get("dummy_host2").iterator().next()); + Assert.assertEquals("dummy_app3", cachedHostData.get("dummy_host3").iterator().next()); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/9e524d7e/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataSync.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataSync.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataSync.java index 78f2bfe..5eab903 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataSync.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/discovery/TestMetadataSync.java @@ -41,9 +41,9 @@ public class TestMetadataSync { PhoenixHBaseAccessor hBaseAccessor = createNiceMock(PhoenixHBaseAccessor.class); final TimelineMetricMetadata testMetadata1 = new TimelineMetricMetadata( - "m1", "a1", "", GAUGE.name(), System.currentTimeMillis(), true); + "m1", "a1", "", GAUGE.name(), System.currentTimeMillis(), true, false); final TimelineMetricMetadata testMetadata2 = new TimelineMetricMetadata( - "m2", "a2", "", GAUGE.name(), System.currentTimeMillis(), true); + "m2", "a2", "", GAUGE.name(), System.currentTimeMillis(), true, false); Map<TimelineMetricMetadataKey, TimelineMetricMetadata> metadata = new HashMap<TimelineMetricMetadataKey, TimelineMetricMetadata>() {{ @@ -88,11 +88,11 @@ public class TestMetadataSync { PhoenixHBaseAccessor hBaseAccessor = createNiceMock(PhoenixHBaseAccessor.class); TimelineMetricMetadata metadata1 = new TimelineMetricMetadata( - "xxx.abc.yyy", "a1", "", GAUGE.name(), System.currentTimeMillis(), true); + "xxx.abc.yyy", "a1", "", GAUGE.name(), System.currentTimeMillis(), true, false); TimelineMetricMetadata metadata2 = new TimelineMetricMetadata( - "xxx.cdef.yyy", "a2", "", GAUGE.name(), System.currentTimeMillis(), true); + "xxx.cdef.yyy", "a2", "", GAUGE.name(), System.currentTimeMillis(), true, false); TimelineMetricMetadata metadata3 = new TimelineMetricMetadata( - "xxx.pqr.zzz", "a3", "", GAUGE.name(), System.currentTimeMillis(), true); + "xxx.pqr.zzz", "a3", "", GAUGE.name(), System.currentTimeMillis(), true, false); expect(configuration.get(TIMELINE_METRIC_METADATA_FILTERS)).andReturn("abc,cde"); http://git-wip-us.apache.org/repos/asf/ambari/blob/9e524d7e/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat new file mode 100644 index 0000000..9f5e25c --- /dev/null +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat @@ -0,0 +1,6 @@ +cpu_system +cpu_user +mem_cached +mem_free +._p_dfs.FSNamesystem.* +._p_jvm.JvmMetrics* \ No newline at end of file
