You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/08/30 13:48:02 UTC
svn commit: r1378892 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/Overseer.java
Author: siren
Date: Thu Aug 30 11:48:02 2012
New Revision: 1378892
URL: http://svn.apache.org/viewvc?rev=1378892&view=rev
Log:
fix for SOLR-3770: Overseer may lose updates to cluster state
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=1378892&r1=1378891&r2=1378892&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Aug 30 11:48:02 2012
@@ -88,6 +88,7 @@ Bug Fixes
* SOLR-3745: Proper error reporting if SolrCloud mode is used w/o
necessary "_version_" field in schema.xml (hossman)
+* SOLR-3770: Overseer may lose updates to cluster state (siren)
Other Changes
----------------------
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=1378892&r1=1378891&r2=1378892&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 Aug 30 11:48:02 2012
@@ -126,8 +126,8 @@ public class Overseer {
final String operation = message.get(QUEUE_OPERATION);
clusterState = processMessage(clusterState, message, operation);
- byte[] processed = stateUpdateQueue.remove();
- workQueue.offer(processed);
+ workQueue.offer(head);
+ stateUpdateQueue.remove();
head = stateUpdateQueue.peek();
}
zkClient.setData(ZkStateReader.CLUSTER_STATE,