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/11 23:46:24 UTC
lucene-solr:master: SOLR-13058 Fix synchronized block
Repository: lucene-solr
Updated Branches:
refs/heads/master 61e448666 -> a7859ff62
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/a7859ff6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a7859ff6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a7859ff6
Branch: refs/heads/master
Commit: a7859ff62ae03d1cffa9d66018528d367b8523cd
Parents: 61e4486
Author: Gus Heck <gu...@apache.org>
Authored: Tue Dec 11 18:45:42 2018 -0500
Committer: Gus Heck <gu...@apache.org>
Committed: Tue Dec 11 18:45:42 2018 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 5 +++++
.../src/java/org/apache/solr/cloud/OverseerTaskProcessor.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7859ff6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 62370de..c7ad02a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -72,6 +72,11 @@ New Features
* SOLR-12593: The default configSet now includes an "ignored_*" dynamic field. (David Smiley)
+Bug Fixes
+----------------------
+
+* 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/a7859ff6/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);
}
}