Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retry close on ThreadInterruptedException 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1421089 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-12-13 07:13:30 +00:00
parent 02dfa0a4a8
commit 4fd821cdfa
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
View File

@ -30,6 +30,7 @@ import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.PrintStreamInfoStream;
import org.apache.lucene.util.ThreadInterruptedException;
import org.apache.solr.core.DirectoryFactory;
import org.apache.solr.schema.IndexSchema;
import org.slf4j.Logger;
@ -137,18 +138,26 @@ public class SolrIndexWriter extends IndexWriter {
public void close() throws IOException {
log.debug("Closing Writer " + name);
Directory directory = getDirectory();
final InfoStream infoStream = isClosed ? null : getConfig().getInfoStream();
final InfoStream infoStream = isClosed ? null : getConfig().getInfoStream();
try {
super.close();
while (true) {
try {
super.close();
} catch (ThreadInterruptedException e) {
// don't allow interruption
continue;
}
break;
}
} finally {
if(infoStream != null) {
if (infoStream != null) {
infoStream.close();
}
isClosed = true;
directoryFactory.release(directory);
numCloses.incrementAndGet();
}
}
@ -156,7 +165,15 @@ public class SolrIndexWriter extends IndexWriter {
@Override
public void rollback() throws IOException {
try {
super.rollback();
while (true) {
try {
super.rollback();
} catch (ThreadInterruptedException e) {
// don't allow interruption
continue;
}
break;
}
} finally {
isClosed = true;
directoryFactory.release(getDirectory());