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 2015/02/25 09:57:39 UTC
svn commit: r1662188 - in /lucene/dev/branches/lucene_solr_4_10/lucene:
CHANGES.txt core/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Wed Feb 25 08:57:37 2015
New Revision: 1662188
URL: http://svn.apache.org/r1662188
Log:
LUCENE-6205: don't let doc values updates write in one thread at the same time as a merge kicking off in another
Modified:
lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1662188&r1=1662187&r2=1662188&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Wed Feb 25 08:57:37 2015
@@ -35,6 +35,10 @@ Bug fixes
3.x index if merges are also running. (Simon Willnauer, Mike
McCandless)
+* LUCENE-6205: Fixed intermittent concurrency issue that could cause
+ FileNotFoundException when writing doc values updates at the same
+ time that a merge kicks off. (Mike McCandless)
+
API Changes
* LUCENE-6212: Deprecate IndexWriter APIs that accept per-document Analyzer.
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1662188&r1=1662187&r2=1662188&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Wed Feb 25 08:57:37 2015
@@ -4153,7 +4153,14 @@ public class IndexWriter implements Clos
// fix the reader's live docs and del count
assert delCount > reader.numDeletedDocs(); // beware of zombies
- SegmentReader newReader = new SegmentReader(info, reader, liveDocs, info.info.getDocCount() - delCount);
+ SegmentReader newReader;
+
+ synchronized (this) {
+ // We must also sync on IW here, because another thread could be writing
+ // new DV updates / remove old gen field infos files causing FNFE:
+ newReader = new SegmentReader(info, reader, liveDocs, info.info.getDocCount() - delCount);
+ }
+
boolean released = false;
try {
rld.release(reader);