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/07/14 19:29:34 UTC
svn commit: r1361568 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Author: markrmiller
Date: Sat Jul 14 17:29:34 2012
New Revision: 1361568
URL: http://svn.apache.org/viewvc?rev=1361568&view=rev
Log:
SOLR-3620: put back cancel recovery in close - it should be fine now
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java?rev=1361568&r1=1361567&r2=1361568&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java Sat Jul 14 17:29:34 2012
@@ -63,7 +63,7 @@ public final class DefaultSolrCoreState
}
@Override
- public void decref(IndexWriterCloser closer) {
+ public void decref(IndexWriterCloser closer) {
synchronized (this) {
refCnt--;
if (refCnt == 0) {
@@ -81,10 +81,11 @@ public final class DefaultSolrCoreState
} catch (Throwable t) {
log.error("Error during shutdown of directory factory.", t);
}
-
- // TODO: we cannot cancel recovery here if its a CoreContainer shutdown
- // it can cause deadlock - but perhaps we want to if we are stopping early
- // and CoreContainer is not being shutdown?
+ try {
+ cancelRecovery();
+ } catch (Throwable t) {
+ log.error("Error cancelling recovery", t);
+ }
closed = true;
}