svn commit: r1229665 - /lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java

[ma...@apache.org]

Author: markrmiller
Date: Tue Jan 10 18:17:45 2012
New Revision: 1229665

URL: http://svn.apache.org/viewvc?rev=1229665&view=rev
Log:
when registering as leader, delete ephem node found there if needed

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1229665&r1=1229664&r2=1229665&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Tue Jan 10 18:17:45 2012
@@ -5,6 +5,7 @@ import org.apache.solr.common.cloud.ZkNo
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.KeeperException.NodeExistsException;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,9 +56,17 @@ final class ShardLeaderElectionContext e
 
   @Override
   void runLeaderProcess() throws KeeperException, InterruptedException {
-    zkClient.makePath(leaderPath,
-        leaderProps == null ? null : ZkStateReader.toJSON(leaderProps),
-        CreateMode.EPHEMERAL, true);
+    try {
+      zkClient.makePath(leaderPath,
+          leaderProps == null ? null : ZkStateReader.toJSON(leaderProps),
+          CreateMode.EPHEMERAL, true);
+    } catch (NodeExistsException e) {
+      // if a previous leader ephemeral exists for some reason, try and remove it
+      zkClient.delete(leaderPath, -1, true);
+      zkClient.makePath(leaderPath,
+          leaderProps == null ? null : ZkStateReader.toJSON(leaderProps),
+          CreateMode.EPHEMERAL, true);
+    }
   }
 }