| commit | e355ac52eb03b8a4d005bd4a24297b4f65236e28 | [log] [tgz] |
|---|---|---|
| author | avijayanhwx <avijayan@hortonworks.com> | Tue Jul 24 13:44:41 2018 -0700 |
| committer | GitHub <noreply@github.com> | Tue Jul 24 13:44:41 2018 -0700 |
| tree | 0bd52a5520a6ed5c646aad7a2dd347e71d0fed6a | |
| parent | e2d2eb55acf0441a34bfcc5540b3842beee7461e [diff] |
AMBARI-24340 : AMS Migration tools should auto-detect whitelist file. (#1868)
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java index 5c4ee4e..1dd380c 100644 --- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java +++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java
@@ -105,12 +105,9 @@ 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();