Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-13058 Fix synchronized block

This commit is contained in:
Gus Heck 2018-12-11 18:45:42 -05:00
parent 61e448666d
commit a7859ff62a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -72,6 +72,11 @@ New Features
* SOLR-12593: The default configSet now includes an "ignored_*" dynamic field. (David Smiley) * 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 Improvements
---------------------- ----------------------

2
solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
View File

@ -345,7 +345,7 @@ public class OverseerTaskProcessor implements Runnable, Closeable {
synchronized (completedTasks) { synchronized (completedTasks) {
for (String id : completedTasks.keySet()) { for (String id : completedTasks.keySet()) {
workQueue.remove(completedTasks.get(id)); workQueue.remove(completedTasks.get(id));
synchronized (runningTasks) { synchronized (runningZKTasks) {
runningZKTasks.remove(id); runningZKTasks.remove(id);
} }
} }