You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/09/15 19:40:32 UTC
svn commit: r1385137 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/core/SolrCore.java
Author: markrmiller
Date: Sat Sep 15 17:40:31 2012
New Revision: 1385137
URL: http://svn.apache.org/viewvc?rev=1385137&view=rev
Log:
SOLR-3844: SolrCore reload can fail because it tries to remove the index write lock while already holding it.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1385137&r1=1385136&r2=1385137&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sat Sep 15 17:40:31 2012
@@ -218,6 +218,9 @@ Bug Fixes
(maxOptimizeSegments, softCommit, expungeDeletes) when sending a commit to
replicas. (Andy Laird, Tomas Fernandez Lobbe, Mark Miller)
+* SOLR-3844: SolrCore reload can fail because it tries to remove the index
+ write lock while already holding it. (Mark Miller)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1385137&r1=1385136&r2=1385137&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java Sat Sep 15 17:40:31 2012
@@ -410,7 +410,7 @@ public final class SolrCore implements S
// protect via synchronized(SolrCore.class)
private static Set<String> dirs = new HashSet<String>();
- void initIndex() {
+ void initIndex(boolean reload) {
try {
String indexDir = getNewIndexDir();
boolean indexExists = getDirectoryFactory().exists(indexDir);
@@ -422,7 +422,7 @@ public final class SolrCore implements S
initIndexReaderFactory();
- if (indexExists && firstTime) {
+ if (indexExists && firstTime && !reload) {
// to remove locks, the directory must already exist... so we create it
// if it didn't exist already...
Directory dir = directoryFactory.get(indexDir, getSolrConfig().indexConfig.lockType);
@@ -644,7 +644,7 @@ public final class SolrCore implements S
this.isReloaded = true;
}
- initIndex();
+ initIndex(prev != null);
initWriters();
initQParsers();