You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/04/23 03:01:45 UTC
svn commit: r1589327 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
core/src/java/org/apache/solr/update/SolrIndexWriter.java
Author: markrmiller
Date: Wed Apr 23 01:01:45 2014
New Revision: 1589327
URL: http://svn.apache.org/r1589327
Log:
SOLR-6002: CLOSE_LOCK does not need to be static, waitForMerges when DirectUpdateHandler2 closes the IndexWriter, add Greg to CHANGES entry.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1589327&r1=1589326&r2=1589327&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Apr 23 01:01:45 2014
@@ -119,7 +119,7 @@ Bug Fixes
* SOLR-6002: Fix a couple of ugly issues around SolrIndexWriter close and
rollback as well as how SolrIndexWriter manages it's ref counted directory
- instance. (Mark Miller)
+ instance. (Mark Miller, Gregory Chanan)
Other Changes
---------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1589327&r1=1589326&r2=1589327&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Wed Apr 23 01:01:45 2014
@@ -786,7 +786,13 @@ public class DirectUpdateHandler2 extend
}
}
- if (writer != null) writer.close();
+ if (writer != null) {
+ try {
+ writer.waitForMerges();
+ } finally {
+ writer.close();
+ }
+ }
} finally {
solrCoreState.getCommitLock().unlock();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=1589327&r1=1589326&r2=1589327&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java Wed Apr 23 01:01:45 2014
@@ -49,7 +49,7 @@ public class SolrIndexWriter extends Ind
* System.currentTimeMillis() when commit was called. */
public static final String COMMIT_TIME_MSEC_KEY = "commitTimeMSec";
- private static final Object CLOSE_LOCK = new Object();
+ private final Object CLOSE_LOCK = new Object();
String name;
private DirectoryFactory directoryFactory;