Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6834: Warn if checkIntegrityAtMerge is configured 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1644707 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2014-12-11 17:21:47 +00:00
parent 135818c0c2
commit 05945a9490
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
solr/CHANGES.txt
View File

@ -116,6 +116,10 @@ Upgrading from Solr 4.x
configs. If you have a strong need to configure this, you must explicitly configure your
schema with a custom codec. See SOLR-6560 and for more details.
* The "checkIntegrityAtMerge" option in solrconfig.xml is now a No-Op and should be removed
from any solrconfig.xml files -- these integrity checks are now done automatically at a very
low level during the segment merging process. See SOLR-6834 for more details.
Detailed Change List
----------------------
@ -469,6 +473,10 @@ Other Changes
* SOLR-6773: Remove the multicore example as the DIH and cloud examples
illustrate multicore behavior (hossman, Timothy Potter)
* SOLR-6834: Warn if checkIntegrityAtMerge is configured. This option is no longer meaningful
since the checks are done automatically at a very low level in the segment merging.
This warning will become an error in Solr 6.0. (hossman)
================== 4.10.3 ==================
Bug Fixes

7
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
View File

@ -81,8 +81,6 @@ public class SolrIndexConfig implements MapSerializable {
public final static String LOCK_TYPE_SINGLE = "single";
public final static String LOCK_TYPE_NONE = "none";
public final boolean checkIntegrityAtMerge;
/**
* Internal constructor for setting defaults based on Lucene Version
*/
@ -101,7 +99,6 @@ public class SolrIndexConfig implements MapSerializable {
mergeSchedulerInfo = null;
defaultMergePolicyClassName = TieredMergePolicy.class.getName();
mergedSegmentWarmerInfo = null;
checkIntegrityAtMerge = false;
}
/**
@ -174,7 +171,9 @@ public class SolrIndexConfig implements MapSerializable {
throw new IllegalArgumentException("Supplying a mergedSegmentWarmer will do nothing since nrtMode is false");
}
checkIntegrityAtMerge = solrConfig.getBool(prefix + "/checkIntegrityAtMerge", def.checkIntegrityAtMerge);
assertWarnOrFail("Begining with Solr 5.0, <checkIntegrityAtMerge> option is no longer supported and should be removed from solrconfig.xml (these integrity checks are now automatic)",
(null == solrConfig.getNode(prefix+"/checkIntegrityAtMerge",false)),
false);
}
@Override
public Map<String, Object> toMap() {

1
solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
View File

@ -26,6 +26,5 @@
<maxIndexingThreads>123</maxIndexingThreads>
<infoStream>true</infoStream>
<mergePolicy class="org.apache.solr.util.RandomMergePolicy" />
<checkIntegrityAtMerge>true</checkIntegrityAtMerge>
</indexConfig>
</config>

7
solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
View File

@ -118,13 +118,6 @@
this is enabled here, and controlled through log4j.properties.
-->
<infoStream>true</infoStream>
<!--
Use true to enable this safety check, which can help
reduce the risk of propagating index corruption from older segments
into new ones, at the expense of slower merging.
-->
<checkIntegrityAtMerge>false</checkIntegrityAtMerge>
</indexConfig>

7
solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
View File

@ -323,13 +323,6 @@
this is enabled here, and controlled through log4j.properties.
-->
<infoStream>true</infoStream>
<!--
Use true to enable this safety check, which can help
reduce the risk of propagating index corruption from older segments
into new ones, at the expense of slower merging.
-->
<checkIntegrityAtMerge>false</checkIntegrityAtMerge>
</indexConfig>