You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gu...@apache.org on 2018/12/12 00:11:24 UTC
lucene-solr:branch_7x: SOLR-13058 Fix synchronized block
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 0512ff2e4 -> 51a80fb5e
SOLR-13058 Fix synchronized block
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/51a80fb5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/51a80fb5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/51a80fb5
Branch: refs/heads/branch_7x
Commit: 51a80fb5e19ddffbb9495f4bad1d6e6ed5a954d5
Parents: 0512ff2
Author: Gus Heck <gu...@apache.org>
Authored: Tue Dec 11 19:10:35 2018 -0500
Committer: Gus Heck <gu...@apache.org>
Committed: Tue Dec 11 19:10:35 2018 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51a80fb5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5a27880..d96a401 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -51,6 +51,8 @@ Bug Fixes
* SOLR-13014: URI Too Long with large streaming expressions in SolrJ (janhoy)
+* SOLR-13058: Fix block that was synchronizing on the wrong collection in OverseerTaskProcessor (Gus Heck)
+
Improvements
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51a80fb5/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
index 3b53a54..d5557e8 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
@@ -345,7 +345,7 @@ public class OverseerTaskProcessor implements Runnable, Closeable {
synchronized (completedTasks) {
for (String id : completedTasks.keySet()) {
workQueue.remove(completedTasks.get(id));
- synchronized (runningTasks) {
+ synchronized (runningZKTasks) {
runningZKTasks.remove(id);
}
}