You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2014/12/11 18:21:48 UTC
svn commit: r1644707 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/update/
core/src/test-files/solr/collection1/conf/
server/solr/configsets/basic_configs/conf/
server/solr/configsets/sample_techproducts_configs/conf/
Author: hossman
Date: Thu Dec 11 17:21:47 2014
New Revision: 1644707
URL: http://svn.apache.org/r1644707
Log:
SOLR-6834: Warn if checkIntegrityAtMerge is configured
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1644707&r1=1644706&r2=1644707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Dec 11 17:21:47 2014
@@ -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
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1644707&r1=1644706&r2=1644707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Thu Dec 11 17:21:47 2014
@@ -81,8 +81,6 @@ public class SolrIndexConfig implements
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
mergeSchedulerInfo = null;
defaultMergePolicyClassName = TieredMergePolicy.class.getName();
mergedSegmentWarmerInfo = null;
- checkIntegrityAtMerge = false;
}
/**
@@ -174,7 +171,9 @@ public class SolrIndexConfig implements
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() {
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml?rev=1644707&r1=1644706&r2=1644707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml Thu Dec 11 17:21:47 2014
@@ -26,6 +26,5 @@
<maxIndexingThreads>123</maxIndexingThreads>
<infoStream>true</infoStream>
<mergePolicy class="org.apache.solr.util.RandomMergePolicy" />
- <checkIntegrityAtMerge>true</checkIntegrityAtMerge>
</indexConfig>
</config>
Modified: lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml?rev=1644707&r1=1644706&r2=1644707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml Thu Dec 11 17:21:47 2014
@@ -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>
Modified: lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml?rev=1644707&r1=1644706&r2=1644707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml Thu Dec 11 17:21:47 2014
@@ -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>