inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1527 from Alfresco/fix/MNT-23234_solr_backup_dir

Browse Source 
Prepend core name to Solr backup dir
This commit is contained in:
Andrea Gazzarini
2022-10-05 12:48:05 +02:00
committed by GitHub
parent 8dd6ea6e12 56edba079c
commit 497d90613e
5 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrconfig.xml
+34 -21
View File
@@ -1160,27 +1160,40 @@
https://wiki.apache.org/solr/SolrCloud/
-->
<requestHandler name="/replication" class="org.alfresco.solr.handler.AlfrescoReplicationHandler">
<!--
To enable simple master/slave replication, uncomment one of the
sections below, depending on whether this solr instance should be
the "master" or a "slave". If this instance is a "slave" you will
also need to fill in the masterUrl to point to a real machine.
-->
<!--
<lst name="master">
<str name="replicateAfter">commit</str>
<str name="replicateAfter">startup</str>
<str name="confFiles">schema.xml,stopwords.txt</str>
</lst>
-->
<!--
<lst name="slave">
<str name="masterUrl">http://your-master-hostname:8983/solr/alfresco</str>
<str name="pollInterval">00:00:60</str>
</lst>
-->
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler">
<!--
To enable simple master/slave replication, uncomment one of the
sections below, depending on whether this solr instance should be
the "master" or a "slave". If this instance is a "slave" you will
also need to fill in the masterUrl to point to a real machine.
-->
<!--
<lst name="master">
<str name="replicateAfter">commit</str>
<str name="replicateAfter">startup</str>
<str name="confFiles">schema.xml,stopwords.txt</str>
</lst>
-->
<!--
<lst name="slave">
<str name="masterUrl">http://your-master-hostname:8983/solr/alfresco</str>
<str name="pollInterval">00:00:60</str>
</lst>
-->
<!--
This invariant is needed to prevent the usage of location parameter in the replication handler APIs.
There is no validation for location parameter. This results in a vulnerability described in https://nvd.nist.gov/vuln/detail/CVE-2020-13941
If the solr.backup.dir property is not specified, it is set to the Solr’s data directory.
-->
<lst name="invariants">
<str name="location">${solr.backup.dir:.}/${solr.core.name}</str>
</lst>
</requestHandler>
<!-- Search Components
search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
+3 -1
View File
@@ -1180,9 +1180,11 @@
<!--
This invariant is needed to prevent the usage of location parameter in the replication handler APIs.
There is no validation for location parameter. This results in a vulnerability described in https://nvd.nist.gov/vuln/detail/CVE-2020-13941
If the solr.backup.dir property is not specified, it is set to the Solr’s data directory.
-->
<lst name="invariants">
<str name="location">${solr.backup.dir:.}</str>
<str name="location">${solr.backup.dir:.}/${solr.core.name}</str>
</lst>
</requestHandler>
search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrconfig.xml
+5 -1
View File
@@ -188,7 +188,11 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" >
<lst name="invariants">
<str name="location">${solr.backup.dir:.}/${solr.core.name}</str>
</lst>
</requestHandler>
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids).
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
+3
View File
@@ -193,6 +193,9 @@
<str name="replicateAfter">commit</str>
<str name="confFiles">schema.xml</str>
</lst>
<lst name="invariants">
<str name="location">${solr.backup.dir:.}/${solr.core.name}</str>
</lst>
</requestHandler>
search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
+3
View File
@@ -197,6 +197,9 @@
<str name="masterUrl">{masterURL}</str>
<str name="pollInterval">00:00:02</str>
</lst>
<lst name="invariants">
<str name="location">${solr.backup.dir:.}/${solr.core.name}</str>
</lst>
</requestHandler>
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids).