diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 572ae2e774f..134374951db 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -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 ---------------------- 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 37278e9dd84..10c745358b3 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java +++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java @@ -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,