Repository: ambari Updated Branches: refs/heads/branch-2.4 1f04e284f -> afdbe4918
AMBARI-17144. Optimize LogSearch Solr for cache setting and default values (Bosco Durai via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/afdbe491 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/afdbe491 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/afdbe491 Branch: refs/heads/branch-2.4 Commit: afdbe49181b27b5c261c4d2a00e7489d47bf6faf Parents: 1f04e28 Author: oleewere <[email protected]> Authored: Mon Jun 13 16:54:28 2016 +0200 Committer: oleewere <[email protected]> Committed: Mon Jun 13 17:02:10 2016 +0200 ---------------------------------------------------------------------- .../main/configsets/audit_logs/conf/solrconfig.xml.j2 | 2 +- .../0.5.0/properties/audit_logs-solrconfig.xml.j2 | 10 +++++----- .../0.5.0/properties/service_logs-solrconfig.xml.j2 | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/afdbe491/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml.j2 ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml.j2 b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml.j2 index c0d8b2f..cb9bea5 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml.j2 +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml.j2 @@ -1651,7 +1651,7 @@ <processor class="solr.DefaultValueUpdateProcessorFactory"> <str name="fieldName">_ttl_</str> - <str name="value">+{{logsearch_service_logs_max_retention}}DAYS</str> + <str name="value">+{{logsearch_audit_logs_max_retention}}DAYS</str> </processor> <processor class="solr.processor.DocExpirationUpdateProcessorFactory"> <int name="autoDeletePeriodSeconds">86400</int> http://git-wip-us.apache.org/repos/asf/ambari/blob/afdbe491/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2 index c870edc..63879e7 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2 @@ -658,7 +658,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml. warming searcher and use it. If "false" then all requests will block until the first searcher is done warming. --> - <useColdSearcher>false</useColdSearcher> + <useColdSearcher>true</useColdSearcher> <!-- Max Warming Searchers @@ -1692,20 +1692,20 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml. <str name="defaultFieldType">key_lower_case</str> <lst name="typeMapping"> <str name="valueClass">java.lang.Boolean</str> - <str name="fieldType">booleans</str> + <str name="fieldType">boolean</str> </lst> <lst name="typeMapping"> <str name="valueClass">java.util.Date</str> - <str name="fieldType">tdates</str> + <str name="fieldType">tdate</str> </lst> <lst name="typeMapping"> <str name="valueClass">java.lang.Long</str> <str name="valueClass">java.lang.Integer</str> - <str name="fieldType">tlongs</str> + <str name="fieldType">tlong</str> </lst> <lst name="typeMapping"> <str name="valueClass">java.lang.Number</str> - <str name="fieldType">tdoubles</str> + <str name="fieldType">tdouble</str> </lst> </processor> http://git-wip-us.apache.org/repos/asf/ambari/blob/afdbe491/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2 index a06a900..b6a4d1d 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2 @@ -658,7 +658,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml. warming searcher and use it. If "false" then all requests will block until the first searcher is done warming. --> - <useColdSearcher>false</useColdSearcher> + <useColdSearcher>true</useColdSearcher> <!-- Max Warming Searchers @@ -1654,7 +1654,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml. <str name="value">+{{logsearch_service_logs_max_retention}}DAYS</str> </processor> <processor class="solr.processor.DocExpirationUpdateProcessorFactory"> - <int name="autoDeletePeriodSeconds">30</int> + <int name="autoDeletePeriodSeconds">86400</int> <str name="ttlFieldName">_ttl_</str> <str name="expirationFieldName">_expire_at_</str> </processor> @@ -1692,20 +1692,20 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml. <str name="defaultFieldType">key_lower_case</str> <lst name="typeMapping"> <str name="valueClass">java.lang.Boolean</str> - <str name="fieldType">booleans</str> + <str name="fieldType">boolean</str> </lst> <lst name="typeMapping"> <str name="valueClass">java.util.Date</str> - <str name="fieldType">tdates</str> + <str name="fieldType">tdate</str> </lst> <lst name="typeMapping"> <str name="valueClass">java.lang.Long</str> <str name="valueClass">java.lang.Integer</str> - <str name="fieldType">tlongs</str> + <str name="fieldType">tlong</str> </lst> <lst name="typeMapping"> <str name="valueClass">java.lang.Number</str> - <str name="fieldType">tdoubles</str> + <str name="fieldType">tdouble</str> </lst> </processor>
