You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2018/05/10 19:15:48 UTC
[ambari] branch trunk updated: AMBARI-23811.
TimelineMetricsFilterTest fails if dir name contains @ (#1237)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4f7b60d AMBARI-23811. TimelineMetricsFilterTest fails if dir name contains @ (#1237)
4f7b60d is described below
commit 4f7b60d8fd45b089ba5e8cf13c0486a4cfc56456
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Thu May 10 21:15:44 2018 +0200
AMBARI-23811. TimelineMetricsFilterTest fails if dir name contains @ (#1237)
---
.../core/timeline/TimelineMetricsFilterTest.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java
index d64bf7c..9a5ae47 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
import org.easymock.EasyMock;
import org.junit.Test;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.HashSet;
import java.util.Set;
@@ -64,9 +65,7 @@ public class TimelineMetricsFilterTest {
expect(configuration.isWhitelistingEnabled()).andReturn(true).anyTimes();
replay(configuration);
- URL fileUrl = ClassLoader.getSystemResource("test_data/metric_whitelist.dat");
-
- metricsConf.set("timeline.metrics.whitelist.file", fileUrl.getPath());
+ metricsConf.set("timeline.metrics.whitelist.file", getTestWhitelistFilePath());
TimelineMetricsFilter.initializeMetricFilter(configuration);
TimelineMetric timelineMetric = new TimelineMetric();
@@ -93,8 +92,7 @@ public class TimelineMetricsFilterTest {
expect(configuration.getMetricsConf()).andReturn(metricsConf).once();
replay(configuration);
- URL fileUrl = ClassLoader.getSystemResource("test_data/metric_whitelist.dat");
- metricsConf.set("timeline.metrics.whitelist.file", fileUrl.getPath());
+ metricsConf.set("timeline.metrics.whitelist.file", getTestWhitelistFilePath());
TimelineMetricsFilter.initializeMetricFilter(configuration);
@@ -161,11 +159,10 @@ public class TimelineMetricsFilterTest {
Configuration metricsConf = new Configuration();
metricsConf.set("timeline.metrics.apps.whitelist", "namenode,nimbus");
metricsConf.set("timeline.metrics.apps.blacklist", "datanode,kafka_broker");
- URL fileUrl = ClassLoader.getSystemResource("test_data/metric_whitelist.dat");
- metricsConf.set("timeline.metrics.whitelist.file", fileUrl.getPath());
+ metricsConf.set("timeline.metrics.whitelist.file", getTestWhitelistFilePath());
expect(configuration.getMetricsConf()).andReturn(metricsConf).once();
- Set<String> whitelist = new HashSet();
+ Set<String> whitelist = new HashSet<>();
whitelist.add("regionserver.Server.Delete_99th_percentile");
whitelist.add("regionserver.Server.Delete_max");
whitelist.add("regionserver.Server.Delete_mean");
@@ -220,4 +217,8 @@ public class TimelineMetricsFilterTest {
timelineMetric.setAppId("hbase");
Assert.assertFalse(TimelineMetricsFilter.acceptMetric(timelineMetric));
}
+
+ private static String getTestWhitelistFilePath() throws URISyntaxException {
+ return ClassLoader.getSystemResource("test_data/metric_whitelist.dat").toURI().getPath();
+ }
}
--
To stop receiving notification emails like this one, please contact
adoroszlai@apache.org.