You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2013/06/29 21:51:45 UTC
svn commit: r1497999 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/SolrCores.java
core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
Author: erick
Date: Sat Jun 29 18:40:49 2013
New Revision: 1497999
URL: http://svn.apache.org/r1497999
Log:
SOLR-4974, tighten up shutdown logic. Inspired by SOLR-4960
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCores.java
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1497999&r1=1497998&r2=1497999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jun 29 18:40:49 2013
@@ -221,6 +221,9 @@ Bug Fixes
* SOLR-4926: Fixed rare replication bug that normally only manifested when
using compound file format. (yonik, Mark Miller)
+
+* SOLR-4974: Outgrowth of SOLR-4960 that includes transient cores and pending cores
+ (Erick Erickson)
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCores.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCores.java?rev=1497999&r1=1497998&r2=1497999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCores.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCores.java Sat Jun 29 18:40:49 2013
@@ -101,64 +101,34 @@ class SolrCores {
// We are shutting down. You can't hold the lock on the various lists of cores while they shut down, so we need to
// make a temporary copy of the names and shut them down outside the lock.
protected void close() {
- Collection<SolrCore> coreList;
- List<String> transientNames;
- List<SolrCore> pendingToClose;
+ Collection<SolrCore> coreList = new ArrayList<SolrCore>();
// It might be possible for one of the cores to move from one list to another while we're closing them. So
// loop through the lists until they're all empty. In particular, the core could have moved from the transient
// list to the pendingCloses list.
- while (true) {
+ do {
+ coreList.clear();
synchronized (modifyLock) {
// make a copy of the cores then clear the map so the core isn't handed out to a request again
- coreList = new ArrayList<SolrCore>(cores.values());
+ coreList.addAll(cores.values());
cores.clear();
- transientNames = new ArrayList<String>(transientCores.keySet());
- pendingToClose = new ArrayList<SolrCore>(pendingCloses);
- }
-
- if (coreList.size() == 0 && transientNames.size() == 0 && pendingToClose.size() == 0) break;
+ coreList.addAll(transientCores.values());
+ transientCores.clear();
- for (SolrCore core : coreList) {
- try {
- core.close();
- } catch (Throwable t) {
- SolrException.log(CoreContainer.log, "Error shutting down core", t);
- }
+ coreList.addAll(pendingCloses);
+ pendingCloses.clear();
}
- for (String coreName : transientNames) {
- SolrCore core = transientCores.get(coreName);
- if (core == null) {
- CoreContainer.log.info("Core " + coreName + " moved from transient core container list before closing.");
- } else {
- try {
- core.close();
- } catch (Throwable t) {
- SolrException.log(CoreContainer.log, "Error shutting down core", t);
- } finally {
- synchronized (modifyLock) {
- transientCores.remove(coreName);
- }
- }
- }
- }
-
- // We might have some cores that we were _thinking_ about shutting down, so take care of those too.
- for (SolrCore core : pendingToClose) {
+ for (SolrCore core : coreList) {
try {
core.close();
} catch (Throwable t) {
SolrException.log(CoreContainer.log, "Error shutting down core", t);
- } finally {
- synchronized (modifyLock) {
- pendingCloses.remove(core);
- }
}
}
- }
+ } while (coreList.size() > 0);
}
//WARNING! This should be the _only_ place you put anything into the list of transient cores!
@@ -304,7 +274,7 @@ class SolrCores {
}
/* If you don't increment the reference count, someone could close the core before you use it. */
- protected SolrCore getCoreFromAnyList(String name, boolean incRefCount) {
+ protected SolrCore getCoreFromAnyList(String name, boolean incRefCount) {
synchronized (modifyLock) {
SolrCore core = cores.get(name);
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml?rev=1497999&r1=1497998&r2=1497999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml Sat Jun 29 18:40:49 2013
@@ -28,7 +28,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="./solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<jmx/>
<updateHandler class="solr.DirectUpdateHandler2">
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java?rev=1497999&r1=1497998&r2=1497999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java Sat Jun 29 18:40:49 2013
@@ -207,9 +207,10 @@ public class OpenCloseCoreStressTest ext
}
} while (secondsRemaining > 0);
- assertTrue("We didn't index any documents, somethings really messsed up", cumulativeDocs > 0);
+ assertTrue("We didn't index any documents, somethings really messed up", cumulativeDocs > 0);
} catch (Exception e) {
e.printStackTrace();
+ fail("Caught unexpected exception");
}
}
@@ -241,6 +242,8 @@ public class OpenCloseCoreStressTest ext
FileUtils.copyFile(new File(testConf, "schema-tiny.xml"), new File(conf, "schema-tiny.xml"));
FileUtils.copyFile(new File(testConf, "solrconfig-minimal.xml"), new File(conf, "solrconfig-minimal.xml"));
+ FileUtils.copyFile(new File(testConf, "solrconfig.snippet.randomindexconfig.xml"),
+ new File(conf, "solrconfig.snippet.randomindexconfig.xml"));
if (!oldStyle) {
FileUtils.copyFile(new File(testSrcRoot, "conf/core.properties"), new File(coreDir, "core.properties"));
@@ -479,7 +482,7 @@ class Queries {
try {
QueryResponse response = server.query(params);
numFound = response.getResults().getNumFound();
- } catch (SolrServerException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
return numFound;