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/09/13 19:59:29 UTC
svn commit: r1702799 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Sun Sep 13 17:59:28 2015
New Revision: 1702799
URL: http://svn.apache.org/r1702799
Log:
LUCENE-6790: block commit while rollback runs
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1702799&r1=1702798&r2=1702799&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Sun Sep 13 17:59:28 2015
@@ -81,6 +81,10 @@ Bug Fixes
too low (no highlight) or determine inOrder wrong.
(Tim Allison via David Smiley)
+* LUCENE-6790: Fix IndexWriter thread safety when one thread is
+ handling a tragic exception but another is still committing (Mike
+ McCandless)
+
Other
* LUCENE-6174: Improve "ant eclipse" to select right JRE for building.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1702799&r1=1702798&r2=1702799&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Sun Sep 13 17:59:28 2015
@@ -2028,15 +2028,19 @@ public class IndexWriter implements Clos
// Ensure that only one thread actually gets to do the
// closing, and make sure no commit is also in progress:
- synchronized(commitLock) {
- if (shouldClose(true)) {
- rollbackInternal();
- }
+ if (shouldClose(true)) {
+ rollbackInternal();
}
}
private void rollbackInternal() throws IOException {
+ // Make sure no commit is running, else e.g. we can close while another thread is still fsync'ing:
+ synchronized(commitLock) {
+ rollbackInternalNoCommit();
+ }
+ }
+ private void rollbackInternalNoCommit() throws IOException {
boolean success = false;
if (infoStream.isEnabled("IW")) {