From 8eae2c82e3cb3d8b7c3a98b0f35a0cd5f4965b7e Mon Sep 17 00:00:00 2001 From: Mark Robert Miller <markrmiller@apache.org> Date: Thu, 27 Nov 2014 01:43:19 +0000 Subject: [PATCH] SOLR-6459: Fix passing the wrong queue. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1641996 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 +- solr/core/src/java/org/apache/solr/cloud/Overseer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index d36c44f2d10..ff8c9750007 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -420,7 +420,7 @@ Other Changes (Mark Miller, Gregory Chanan) * SOLR-6459: Normalize logging of operations in Overseer and log current queue size. - (Ramkumar Aiyengar via Mark Miller) + (Ramkumar Aiyengar, shalin via Mark Miller) * SOLR-6754: ZkController.publish doesn't use the updateLastState parameter. (shalin) diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java index 0be295a7f31..7f13e81d4b7 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java +++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java @@ -314,7 +314,7 @@ public class Overseer implements Closeable { final TimerContext timerContext = stats.time(operation); try { - clusterState = processMessage(clusterState, message, operation, workQueue.getStats().getQueueLength()); + clusterState = processMessage(clusterState, message, operation, stateUpdateQueue.getStats().getQueueLength()); stats.success(operation); } catch (Exception e) { // generally there is nothing we can do - in most cases, we have