[ambari] branch branch-2.7 updated: AMBARI-24340 : AMS Migration tools should auto-detect whitelist file. (#1852)

[avijayan]

This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new aa726aa  AMBARI-24340 : AMS Migration tools should auto-detect 
whitelist file. (#1852)
aa726aa is described below

commit aa726aa7f999d5ed00f46b18da189aa406f95738
Author: avijayanhwx <avija...@hortonworks.com>
AuthorDate: Tue Jul 24 12:39:05 2018 -0700

    AMBARI-24340 : AMS Migration tools should auto-detect whitelist file. 
(#1852)
---
 .../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();