You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2018/07/24 20:44:44 UTC
[ambari] branch trunk updated: AMBARI-24340 : AMS Migration tools
should auto-detect whitelist file. (#1868)
This is an automated email from the ASF dual-hosted git repository.
avijayan 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 0dd8ffc AMBARI-24340 : AMS Migration tools should auto-detect whitelist file. (#1868)
0dd8ffc is described below
commit 0dd8ffcdbc71f9363e809f53d0adba0fd08372e6
Author: avijayanhwx <av...@hortonworks.com>
AuthorDate: Tue Jul 24 13:44:41 2018 -0700
AMBARI-24340 : AMS Migration tools should auto-detect whitelist file. (#1868)
---
.../core/timeline/upgrade/core/MetricsDataMigrationLauncher.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java
index 5c4ee4e..1dd380c 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java
@@ -105,12 +105,9 @@ public class MetricsDataMigrationLauncher {
if (whitelistedFilePath != null) {
this.metricNames = readMetricWhitelistFromFile(whitelistedFilePath);
- } else if (timelineMetricConfiguration.isWhitelistingEnabled()) {
+ } else {
String whitelistFile = timelineMetricConfiguration.getMetricsConf().get(TimelineMetricConfiguration.TIMELINE_METRICS_WHITELIST_FILE, TimelineMetricConfiguration.TIMELINE_METRICS_WHITELIST_FILE_LOCATION_DEFAULT);
metricNames = readMetricWhitelistFromFile(whitelistFile);
- } else {
- LOG.error("No whitelisted metrics specified. Exiting...");
- throw new Exception("List of whitelisted metrics must be provided");
}
readProcessedMetricsMap();