From a7859ff62ae03d1cffa9d66018528d367b8523cd Mon Sep 17 00:00:00 2001
From: Gus Heck <gus@apache.org>
Date: Tue, 11 Dec 2018 18:45:42 -0500
Subject: [PATCH] SOLR-13058 Fix synchronized block

---
 solr/CHANGES.txt                                             | 5 +++++
 .../java/org/apache/solr/cloud/OverseerTaskProcessor.java    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 62370de8993..c7ad02a3382 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
 ----------------------
 
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 3b53a541c06..d5557e885a2 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);
         }
       }