You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2017/10/24 20:14:29 UTC
[08/50] [abbrv] ambari git commit: AMBARI-22273. Disable xmlparser
and configEdit API in Infra Solr by default (oleewere)
AMBARI-22273. Disable xmlparser and configEdit API in Infra Solr by default (oleewere)
(cherry picked from commit 0da1de119e74600109fde146cdc8a60c06e202e5)
Change-Id: I626d2ce0b123c0eb73c44fa1d8cbfd8dd4bca644
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1f96308
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1f96308
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1f96308
Branch: refs/heads/AMBARI-2.6.0.0
Commit: e1f963089ac60b68c17d62947f35aab289a838b9
Parents: 5f627e6
Author: Oliver Szabo <ol...@gmail.com>
Authored: Fri Oct 20 00:37:37 2017 +0200
Committer: oleewere@gmail.com <je...@hortonworks.com>
Committed: Fri Oct 20 10:04:22 2017 +0000
----------------------------------------------------------------------
.../src/main/configsets/audit_logs/conf/solrconfig.xml | 1 +
.../src/main/configsets/hadoop_logs/conf/solrconfig.xml | 1 +
.../src/main/configsets/history/conf/solrconfig.xml | 1 +
.../AMBARI_INFRA/0.1.0/properties/infra-solr-env.sh.j2 | 1 +
.../ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml | 2 +-
.../LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2 | 1 +
.../LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2 | 1 +
.../RANGER/0.7.0/properties/ranger-solrconfig.xml.j2 | 1 +
8 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml
index 7af91df..36de644 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/solrconfig.xml
@@ -1839,6 +1839,7 @@
<!--
<queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-->
+ <queryParser name="xmlparser" class="solr.ExtendedDismaxQParserPlugin" />
<!-- Function Parsers
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/solrconfig.xml b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/solrconfig.xml
index 59f778f..f1e983a 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/solrconfig.xml
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/solrconfig.xml
@@ -1839,6 +1839,7 @@
<!--
<queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-->
+ <queryParser name="xmlparser" class="solr.ExtendedDismaxQParserPlugin" />
<!-- Function Parsers
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/history/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/history/conf/solrconfig.xml b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/history/conf/solrconfig.xml
index 8244a08..f3e82e1 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/history/conf/solrconfig.xml
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/history/conf/solrconfig.xml
@@ -1825,6 +1825,7 @@
<!--
<queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-->
+ <queryParser name="xmlparser" class="solr.ExtendedDismaxQParserPlugin" />
<!-- Function Parsers
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/properties/infra-solr-env.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/properties/infra-solr-env.sh.j2 b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/properties/infra-solr-env.sh.j2
index 5cc344e..aeb7f04 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/properties/infra-solr-env.sh.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/properties/infra-solr-env.sh.j2
@@ -71,6 +71,7 @@ RMI_PORT={{infra_solr_jmx_port}}
#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoSoftCommit.maxTime=3000"
#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=60000"
#SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true"
+SOLR_OPTS="$SOLR_OPTS -Ddisable.configEdit=true"
# Location where the bin/solr script will save PID files for running instances
# If not set, the script will create PID files in $SOLR_TIP/bin
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml
index cba4a4e..8a850d5 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml
@@ -170,7 +170,7 @@
<infoStream>true</infoStream>
</indexConfig>
-
+ <queryParser name="xmlparser" class="solr.ExtendedDismaxQParserPlugin" />
<!-- JMX
This example enables JMX if and only if an existing MBeanServer
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/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 63879e7..d46e968 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
@@ -1839,6 +1839,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml.
<!--
<queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-->
+ <queryParser name="xmlparser" class="solr.ExtendedDismaxQParserPlugin" />
<!-- Function Parsers
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/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 b6a4d1d..6ec5538 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
@@ -1839,6 +1839,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml.
<!--
<queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-->
+ <queryParser name="xmlparser" class="solr.ExtendedDismaxQParserPlugin" />
<!-- Function Parsers
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f96308/ambari-server/src/main/resources/common-services/RANGER/0.7.0/properties/ranger-solrconfig.xml.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/properties/ranger-solrconfig.xml.j2 b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/properties/ranger-solrconfig.xml.j2
index 25dbb7a..e79331d 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/properties/ranger-solrconfig.xml.j2
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/properties/ranger-solrconfig.xml.j2
@@ -1826,6 +1826,7 @@
<!--
<queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-->
+ <queryParser name="xmlparser" class="solr.ExtendedDismaxQParserPlugin" />
<!-- Function Parsers