You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2015/08/09 23:47:28 UTC
svn commit: r1694914 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
Author: erick
Date: Sun Aug 9 21:47:28 2015
New Revision: 1694914
URL: http://svn.apache.org/r1694914
Log:
SOLR-7836: Possible deadlock when closing refcounted index writers. Surrounded ulog updates with updatelock
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1694914&r1=1694913&r2=1694914&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Sun Aug 9 21:47:28 2015
@@ -240,8 +240,9 @@ public class DirectUpdateHandler2 extend
} finally {
iw.decref();
}
-
- if (ulog != null) ulog.add(cmd);
+ synchronized (solrCoreState.getUpdateLock()) {
+ if (ulog != null) ulog.add(cmd);
+ }
}
private void doNormalUpdate(AddUpdateCommand cmd) throws IOException {
@@ -287,7 +288,9 @@ public class DirectUpdateHandler2 extend
// This also ensures that if a commit sneaks in-between, that we
// know everything in a particular
// log version was definitely committed.
- if (ulog != null) ulog.add(cmd);
+ synchronized (solrCoreState.getUpdateLock()) {
+ if (ulog != null) ulog.add(cmd);
+ }
}
private void addAndDelete(AddUpdateCommand cmd, List<UpdateLog.DBQ> deletesAfter) throws IOException {
@@ -323,7 +326,9 @@ public class DirectUpdateHandler2 extend
} finally {
iw.decref();
}
- if (ulog != null) ulog.add(cmd, true);
+ synchronized (solrCoreState.getUpdateLock()) {
+ if (ulog != null) ulog.add(cmd, true);
+ }
}
private void updateDeleteTrackers(DeleteUpdateCommand cmd) {