You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/10/14 12:17:10 UTC
svn commit: r1531839 - in /lucene/dev/branches/lucene_solr_4_5: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Mon Oct 14 10:17:10 2013
New Revision: 1531839
URL: http://svn.apache.org/r1531839
Log:
LUCENE-5263: if merge hits exc when releasing merged reader then drop changes and remove it from the pool, since the merge will be aborted
Modified:
lucene/dev/branches/lucene_solr_4_5/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/branches/lucene_solr_4_5/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_5/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1531839&r1=1531838&r2=1531839&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_5/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_5/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Mon Oct 14 10:17:10 2013
@@ -3331,13 +3331,22 @@ public class IndexWriter implements Clos
assert merge.info.info.getDocCount() != 0 || keepFullyDeletedSegments || dropSegment;
if (mergedDeletes != null) {
- if (dropSegment) {
- mergedDeletes.dropChanges();
+ boolean success = false;
+ try {
+ if (dropSegment) {
+ mergedDeletes.dropChanges();
+ }
+ // Pass false for assertInfoLive because the merged
+ // segment is not yet live (only below do we commit it
+ // to the segmentInfos):
+ readerPool.release(mergedDeletes, false);
+ success = true;
+ } finally {
+ if (!success) {
+ mergedDeletes.dropChanges();
+ readerPool.drop(merge.info);
+ }
}
- // Pass false for assertInfoLive because the merged
- // segment is not yet live (only below do we commit it
- // to the segmentInfos):
- readerPool.release(mergedDeletes, false);
}
// Must do this after readerPool.release, in case an