Repository: ambari Updated Branches: refs/heads/trunk b9e51f564 -> 1436c9774
AMBARI-17190. Ignore logs for performance testing of grok patters (Hayat Behlim via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1436c977 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1436c977 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1436c977 Branch: refs/heads/trunk Commit: 1436c97741e10807da93b6f5b099d24a70ba9603 Parents: b9e51f5 Author: oleewere <oleew...@gmail.com> Authored: Wed Jun 15 19:40:27 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Wed Jun 15 19:40:27 2016 +0200 ---------------------------------------------------------------------- .../ambari/logfeeder/logconfig/FetchConfigFromSolr.java | 7 +++++-- .../main/java/org/apache/ambari/logfeeder/util/SolrUtil.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1436c977/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/FetchConfigFromSolr.java ---------------------------------------------------------------------- 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 1f86dd0..f2d074a 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); http://git-wip-us.apache.org/repos/asf/ambari/blob/1436c977/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/SolrUtil.java ---------------------------------------------------------------------- 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 200a603..29feef7 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; }
