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 2012/01/10 16:40:59 UTC
svn commit: r1229603 -
/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Author: markrmiller
Date: Tue Jan 10 15:40:58 2012
New Revision: 1229603
URL: http://svn.apache.org/viewvc?rev=1229603&view=rev
Log:
dont register the live node until all cores have registered when coming back from expiration
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1229603&r1=1229602&r2=1229603&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java Tue Jan 10 15:40:58 2012
@@ -159,7 +159,6 @@ public final class ZkController {
public void command() {
try {
// we need to create all of our lost watches
- createEphemeralLiveNode();
zkStateReader.createClusterStateWatchersAndUpdate();
// re register all descriptors
@@ -173,6 +172,9 @@ public final class ZkController {
register(descriptor.getName(), descriptor, true);
}
}
+
+ // don't advertise as live until everyone has registered
+ createEphemeralLiveNode();
} catch (InterruptedException e) {
// Restore the interrupted status