You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/10/04 00:56:24 UTC
svn commit: r1393806 - in /lucene/dev/trunk: ./ lucene/ lucene/codecs/
lucene/codecs/src/java/org/apache/lucene/codecs/bloom/ lucene/core/
lucene/core/src/java/org/apache/lucene/codecs/
lucene/core/src/java/org/apache/lucene/index/ lucene/core/src/test...
Author: rmuir
Date: Wed Oct 3 22:56:24 2012
New Revision: 1393806
URL: http://svn.apache.org/viewvc?rev=1393806&view=rev
Log:
merge branches/slowclosing: fix handling of exceptions during close, randomly close slowly in mockdir
Added:
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java
- copied unchanged from r1393785, lucene/dev/branches/slowclosing/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/codecs/ (props changed)
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/trunk/lucene/core/ (props changed)
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/test-framework/ (props changed)
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1393806&r1=1393805&r2=1393806&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Wed Oct 3 22:56:24 2012
@@ -159,6 +159,7 @@ public final class BloomFilteringPosting
String bloomFileName = IndexFileNames.segmentFileName(
state.segmentInfo.name, state.segmentSuffix, BLOOM_EXTENSION);
IndexInput bloomIn = null;
+ boolean success = false;
try {
bloomIn = state.dir.openInput(bloomFileName, state.context);
CodecUtil.checkHeader(bloomIn, BLOOM_CODEC_NAME, BLOOM_CODEC_VERSION,
@@ -178,10 +179,13 @@ public final class BloomFilteringPosting
FieldInfo fieldInfo = state.fieldInfos.fieldInfo(fieldNum);
bloomsByFieldName.put(fieldInfo.name, bloom);
}
- } finally {
IOUtils.close(bloomIn);
+ success = true;
+ } finally {
+ if (!success) {
+ IOUtils.closeWhileHandlingException(bloomIn, delegateFieldsProducer);
+ }
}
-
}
public Iterator<String> iterator() {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1393806&r1=1393805&r2=1393806&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Wed Oct 3 22:56:24 2012
@@ -172,12 +172,15 @@ public class BlockTreeTermsReader extend
throw new CorruptIndexException("duplicate field: " + fieldInfo.name + " (resource=" + in + ")");
}
}
+ if (indexDivisor != -1) {
+ indexIn.close();
+ }
+
success = true;
} finally {
if (!success) {
+ // this.close() will close in:
IOUtils.closeWhileHandlingException(indexIn, this);
- } else if (indexDivisor != -1) {
- indexIn.close();
}
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java?rev=1393806&r1=1393805&r2=1393806&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java Wed Oct 3 22:56:24 2012
@@ -151,7 +151,7 @@ final class StandardDirectoryReader exte
}
boolean success = false;
- IOException prior = null;
+ Throwable prior = null;
try {
SegmentReader newReader;
if (newReaders[i] == null || infos.info(i).info.getUseCompoundFile() != newReaders[i].getSegmentInfo().info.getUseCompoundFile()) {
@@ -176,7 +176,7 @@ final class StandardDirectoryReader exte
}
}
success = true;
- } catch (IOException ex) {
+ } catch (Throwable ex) {
prior = ex;
} finally {
if (!success) {
@@ -192,14 +192,19 @@ final class StandardDirectoryReader exte
// closing we must decRef it
newReaders[i].decRef();
}
- } catch (IOException ex) {
- if (prior == null) prior = ex;
+ } catch (Throwable t) {
+ if (prior == null) prior = t;
}
}
}
}
// throw the first exception
- if (prior != null) throw prior;
+ if (prior != null) {
+ if (prior instanceof IOException) throw (IOException) prior;
+ if (prior instanceof RuntimeException) throw (RuntimeException) prior;
+ if (prior instanceof Error) throw (Error) prior;
+ throw new RuntimeException(prior);
+ }
}
}
return new StandardDirectoryReader(directory, newReaders, writer, infos, termInfosIndexDivisor, false);
@@ -329,13 +334,13 @@ final class StandardDirectoryReader exte
@Override
protected void doClose() throws IOException {
- IOException ioe = null;
+ Throwable firstExc = null;
for (final AtomicReader r : getSequentialSubReaders()) {
// try to close each reader, even if an exception is thrown
try {
r.decRef();
- } catch (IOException e) {
- if (ioe == null) ioe = e;
+ } catch (Throwable t) {
+ if (t == null) firstExc = t;
}
}
@@ -346,7 +351,12 @@ final class StandardDirectoryReader exte
}
// throw the first exception
- if (ioe != null) throw ioe;
+ if (firstExc != null) {
+ if (firstExc instanceof IOException) throw (IOException) firstExc;
+ if (firstExc instanceof RuntimeException) throw (RuntimeException) firstExc;
+ if (firstExc instanceof Error) throw (Error) firstExc;
+ throw new RuntimeException(firstExc);
+ }
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1393806&r1=1393805&r2=1393806&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Wed Oct 3 22:56:24 2012
@@ -1025,7 +1025,6 @@ public class TestIndexWriter extends Luc
}
w.close();
w = null;
- _TestUtil.checkIndex(dir);
DirectoryReader.open(dir).close();
// Strangely, if we interrupt a thread before
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1393806&r1=1393805&r2=1393806&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Wed Oct 3 22:56:24 2012
@@ -498,7 +498,14 @@ public class MockDirectoryWrapper extend
throw fillOpenTrace(new IOException("MockDirectoryWrapper: file \"" + name + "\" is still open for writing"), name, false);
}
- IndexInput ii = new MockIndexInputWrapper(this, name, delegate.openInput(name, LuceneTestCase.newIOContext(randomState, context)));
+ IndexInput delegateInput = delegate.openInput(name, LuceneTestCase.newIOContext(randomState, context));
+
+ final IndexInput ii;
+ if (randomState.nextInt(500) == 0) {
+ ii = new SlowClosingMockIndexInputWrapper(this, name, delegateInput);
+ } else {
+ ii = new MockIndexInputWrapper(this, name, delegateInput);
+ }
addFileHandle(ii, name, Handle.Input);
return ii;
}