You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/06/02 12:51:04 UTC
svn commit: r1683073 - in /lucene/dev/branches/lucene6508/solr:
contrib/morphlines-core/src/test-files/solr/collection1/conf/
contrib/morphlines-core/src/test-files/solr/minimr/conf/
contrib/morphlines-core/src/test-files/solr/mrunit/conf/ contrib/morp...
Author: uschindler
Date: Tue Jun 2 10:51:03 2015
New Revision: 1683073
URL: http://svn.apache.org/r1683073
Log:
LUCENE-6508: Add a note that Solr no longer supports unlockOnStartup. Also remove from example configs.
Modified:
lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene6508/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/example/files/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
lucene/dev/branches/lucene6508/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
Modified: lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -220,19 +220,6 @@
-->
<!-- <lockType>native</lockType> -->
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'none' or 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
-->
Modified: lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -236,19 +236,6 @@
-->
<lockType>${solr.lock.type:hdfs}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
-->
Modified: lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -238,19 +238,6 @@
-->
<lockType>${solr.lock.type:hdfs}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
-->
Modified: lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -220,19 +220,6 @@
-->
<!-- <lockType>native</lockType> -->
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'none' or 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
-->
Modified: lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -239,19 +239,6 @@
-->
<lockType>${solr.lock.type:hdfs}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
-->
Modified: lucene/dev/branches/lucene6508/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/lucene6508/solr/core/src/java/org/apache/solr/core/SolrCore.java Tue Jun 2 10:51:03 2015
@@ -516,10 +516,11 @@ public final class SolrCore implements S
try {
if (IndexWriter.isLocked(dir)) {
log.error(logid
- + "Solr index directory '{}' is locked. Throwing exception",
+ + "Solr index directory '{}' is locked. Throwing exception.",
indexDir);
throw new LockObtainFailedException(
- "Index locked for write for core " + name);
+ "Index locked for write for core '" + name +
+ "'. Solr now longer supports forceful unlocking via 'unlockOnStartup'. Please verify locks manually!");
}
} finally {
directoryFactory.release(dir);
Modified: lucene/dev/branches/lucene6508/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml (original)
+++ lucene/dev/branches/lucene6508/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml Tue Jun 2 10:51:03 2015
@@ -23,12 +23,10 @@
<indexConfig>
<useCompoundFile>true</useCompoundFile>
- <unlockOnStartup>false</unlockOnStartup>
</indexConfig>
<!-- BEGIN BAD: multiple indexConfig sections -->
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- <unlockOnStartup>true</unlockOnStartup>
</indexConfig>
<!-- END BAD -->
Modified: lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/db/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -263,19 +263,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.
Modified: lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -266,19 +266,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.
Modified: lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -263,19 +263,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.
Modified: lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -263,19 +263,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.
Modified: lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -264,19 +264,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.
Modified: lucene/dev/branches/lucene6508/solr/example/files/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/example/files/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/example/files/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/example/files/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -243,19 +243,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.
Modified: lucene/dev/branches/lucene6508/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -244,19 +244,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.
Modified: lucene/dev/branches/lucene6508/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml?rev=1683073&r1=1683072&r2=1683073&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6508/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml Tue Jun 2 10:51:03 2015
@@ -246,19 +246,6 @@
-->
<lockType>${solr.lock.type:native}</lockType>
- <!-- Unlock On Startup
-
- If true, unlock any held write or commit locks on startup.
- This defeats the locking mechanism that allows multiple
- processes to safely access a lucene index, and should be used
- with care. Default is "false".
-
- This is not needed if lock type is 'single'
- -->
- <!--
- <unlockOnStartup>false</unlockOnStartup>
- -->
-
<!-- Commit Deletion Policy
Custom deletion policies can be specified here. The class must
implement org.apache.lucene.index.IndexDeletionPolicy.