You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/11/27 02:43:19 UTC
svn commit: r1641996 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/Overseer.java
Author: markrmiller
Date: Thu Nov 27 01:43:19 2014
New Revision: 1641996
URL: http://svn.apache.org/r1641996
Log:
SOLR-6459: Fix passing the wrong queue.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1641996&r1=1641995&r2=1641996&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Nov 27 01:43:19 2014
@@ -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)
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1641996&r1=1641995&r2=1641996&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java Thu Nov 27 01:43:19 2014
@@ -314,7 +314,7 @@ public class Overseer implements Closeab
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