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/06/11 11:22:03 UTC
svn commit: r1348760 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
Author: siren
Date: Mon Jun 11 09:22:03 2012
New Revision: 1348760
URL: http://svn.apache.org/viewvc?rev=1348760&view=rev
Log:
SOLR-3511 make sure parent node exits before using the queue, check leader status before every update when in fallback mode
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
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=1348760&r1=1348759&r2=1348760&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 Mon Jun 11 09:22:03 2012
@@ -80,7 +80,7 @@ public class Overseer {
CloudState cloudState = reader.getCloudState();
log.info("Replaying operations from work queue.");
- while (head != null) {
+ while (head != null && amILeader()) {
final ZkNodeProps message = ZkNodeProps.load(head);
final String operation = message
.get(QUEUE_OPERATION);
@@ -381,6 +381,7 @@ public class Overseer {
public Overseer(final ZkStateReader reader, final String id) throws KeeperException, InterruptedException {
log.info("Overseer (id=" + id + ") starting");
+ createOverseerNode(reader.getZkClient());
//launch cluster state updater thread
ThreadGroup tg = new ThreadGroup("Overseer state updater.");
Thread updaterThread = new Thread(tg, new CloudStateUpdater(reader, id));