AMBARI-17190. Ignore logs for performance testing of grok patters (Hayat Behlim via oleewere)

2 files changed, 10 insertions, 4 deletions

diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/FetchConfigFromSolr.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/FetchConfigFromSolr.java
index 1f86dd0e8b..f2d074a420 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/FetchConfigFromSolr.java
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/FetchConfigFromSolr.java
@@ -48,8 +48,11 @@ public class FetchConfigFromSolr extends Thread {
   @Override
   public void run() {
     String zkHosts = LogFeederUtil.getStringProperty("logfeeder.solr.zkhosts");
-    if( zkHosts == null || zkHosts.trim().length() == 0 ) {
-      logger.warn("Solr ZKHosts for UserConfig/History is not set. Won't look for level configuration from Solr.");
+    String solrUrl = LogFeederUtil.getStringProperty("logfeeder.solr.url");
+    if ((zkHosts == null || zkHosts.trim().length() == 0)
+        && (solrUrl == null || solrUrl.trim().length() == 0)) {
+      logger
+          .warn("Solr ZKHosts or solrUrl for UserConfig/History is not set. Won't look for level configuration from Solr.");
       return;
     }
     solrConfigInterval = LogFeederUtil.getIntProperty("logfeeder.solr.config.interval", solrConfigInterval);
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/SolrUtil.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/SolrUtil.java
index 200a603e24..29feef7b45 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/SolrUtil.java
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/SolrUtil.java
@@ -143,7 +143,7 @@ public class SolrUtil {
             + solrDetail + ", response=" + response);
           break;
         } else {
-          logger.warn("Solr is not not reachable yet. getCollections() attempt count=" + pingCount
+          logger.warn("Solr is not reachable yet. getCollections() attempt count=" + pingCount
             + ". Will sleep for " + waitIntervalMS + " ms and try again." + " solr=" + solrDetail
             + ", response=" + response);
 
@@ -194,7 +194,10 @@ public class SolrUtil {
         }
       }
     } catch (Exception e) {
-      logger.error("Error getting config", e);
+      final String logMessageKey = this.getClass().getSimpleName()
+          + "_FETCH_FILTER_CONFIG_ERROR";
+      LogFeederUtil.logErrorMessageByInterval(logMessageKey,
+          "Error getting filter config from solr", e, logger, Level.ERROR);
     }
     return configMap;
   }