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 2013/02/15 19:42:26 UTC
svn commit: r1446719 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/
lucene/core/src/test/org/apache/l...
Author: markrmiller
Date: Fri Feb 15 18:42:24 2013
New Revision: 1446719
URL: http://svn.apache.org/r1446719
Log:
SOLR-4463: Fix SolrCoreState reference counting.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (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/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (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
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/site/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1446719&r1=1446718&r2=1446719&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Feb 15 18:42:24 2013
@@ -99,6 +99,8 @@ Bug Fixes
* SOLR-4426: NRTCachingDirectoryFactory does not initialize maxCachedMB and maxMergeSizeMB
if <directoryFactory> is not present in solrconfig.xml (Jack Krupansky via shalin)
+* SOLR-4463: Fix SolrCoreState reference counting. (Mark Miller)
+
Optimizations
----------------------
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=1446719&r1=1446718&r2=1446719&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 Fri Feb 15 18:42:24 2013
@@ -44,7 +44,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
@@ -150,7 +149,6 @@ public final class SolrCore implements S
private final String dataDir;
private final UpdateHandler updateHandler;
private final SolrCoreState solrCoreState;
- private int solrCoreStateRefCnt = 1;
private final long startTime;
private final RequestHandlers reqHandlers;
@@ -396,7 +394,7 @@ public final class SolrCore implements S
IndexSchema schema = new IndexSchema(config,
getSchema().getResourceName(), null);
- increfSolrCoreState();
+ solrCoreState.increfSolrCoreState();
SolrCore core = new SolrCore(getName(), getDataDir(), config,
schema, coreDescriptor, updateHandler, prev);
@@ -867,32 +865,6 @@ public final class SolrCore implements S
public SolrCoreState getSolrCoreState() {
return solrCoreState;
}
-
- private void increfSolrCoreState() {
- synchronized (solrCoreState) {
- if (solrCoreStateRefCnt == 0) {
- throw new IllegalStateException("IndexWriter has been closed");
- }
- solrCoreStateRefCnt++;
- }
- }
-
- private void decrefSolrCoreState(IndexWriterCloser closer) {
- synchronized (solrCoreState) {
-
- solrCoreStateRefCnt--;
- if (solrCoreStateRefCnt == 0) {
-
- try {
- log.info("Closing SolrCoreState");
- solrCoreState.close(closer);
- } catch (Throwable t) {
- log.error("Error closing SolrCoreState", t);
- }
-
- }
- }
- }
/**
* @return an update processor registered to the given name. Throw an exception if this chain is undefined
@@ -976,10 +948,12 @@ public final class SolrCore implements S
}
try {
- if (updateHandler instanceof IndexWriterCloser) {
- decrefSolrCoreState((IndexWriterCloser) updateHandler);
- } else {
- decrefSolrCoreState(null);
+ if (solrCoreState != null) {
+ if (updateHandler instanceof IndexWriterCloser) {
+ solrCoreState.decrefSolrCoreState((IndexWriterCloser) updateHandler);
+ } else {
+ solrCoreState.decrefSolrCoreState(null);
+ }
}
} catch (Throwable e) {
SolrException.log(log, e);
@@ -1005,15 +979,14 @@ public final class SolrCore implements S
}
if (solrCoreState != null) { // bad startup case
- synchronized (solrCoreState) {
- if (solrCoreStateRefCnt == 0) {
- try {
- directoryFactory.close();
- } catch (Throwable t) {
- SolrException.log(log, t);
- }
+ if (solrCoreState.getSolrCoreStateRefCnt() == 0) {
+ try {
+ directoryFactory.close();
+ } catch (Throwable t) {
+ SolrException.log(log, t);
}
}
+
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCoreState.java?rev=1446719&r1=1446718&r2=1446719&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCoreState.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCoreState.java Fri Feb 15 18:42:24 2013
@@ -25,6 +25,8 @@ import org.apache.solr.core.CoreContaine
import org.apache.solr.core.DirectoryFactory;
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.RefCounted;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The state in this class can be easily shared between SolrCores across
@@ -32,12 +34,46 @@ import org.apache.solr.util.RefCounted;
*
*/
public abstract class SolrCoreState {
+ public static Logger log = LoggerFactory.getLogger(SolrCoreState.class);
+
private final Object deleteLock = new Object();
public Object getUpdateLock() {
return deleteLock;
}
+ private int solrCoreStateRefCnt = 1;
+
+ public synchronized int getSolrCoreStateRefCnt() {
+ return solrCoreStateRefCnt;
+ }
+
+ public void increfSolrCoreState() {
+ synchronized (this) {
+ if (solrCoreStateRefCnt == 0) {
+ throw new IllegalStateException("IndexWriter has been closed");
+ }
+ solrCoreStateRefCnt++;
+ }
+ }
+
+ public void decrefSolrCoreState(IndexWriterCloser closer) {
+ synchronized (this) {
+
+ solrCoreStateRefCnt--;
+ if (solrCoreStateRefCnt == 0) {
+
+ try {
+ log.info("Closing SolrCoreState");
+ close(closer);
+ } catch (Throwable t) {
+ log.error("Error closing SolrCoreState", t);
+ }
+
+ }
+ }
+ }
+
public abstract Lock getCommitLock();
/**
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1446719&r1=1446718&r2=1446719&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Fri Feb 15 18:42:24 2013
@@ -22,6 +22,8 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
@@ -77,6 +79,33 @@ public class TestCoreContainer extends S
System.clearProperty("shareSchema");
}
}
+
+ @Test
+ public void testReload() throws Exception {
+ final CoreContainer cc = h.getCoreContainer();
+
+ class TestThread extends Thread {
+ @Override
+ public void run() {
+ cc.reload("collection1");
+ }
+ }
+
+ List<Thread> threads = new ArrayList<Thread>();
+ int numThreads = 4;
+ for (int i = 0; i < numThreads; i++) {
+ threads.add(new TestThread());
+ }
+
+ for (Thread thread : threads) {
+ thread.start();
+ }
+
+ for (Thread thread : threads) {
+ thread.join();
+ }
+
+ }
@Test
public void testPersist() throws Exception {