You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2016/04/21 23:11:44 UTC
[4/4] lucene-solr:branch_5_5: SOLR-8837: Fix duplicate election node
detection
SOLR-8837: Fix duplicate election node detection
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/55ac1ab9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/55ac1ab9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/55ac1ab9
Branch: refs/heads/branch_5_5
Commit: 55ac1ab95819f307f8056f8ddffbdd349ea51247
Parents: f6fca69
Author: Alan Woodward <ro...@apache.org>
Authored: Mon Mar 21 17:39:37 2016 +0000
Committer: Anshum Gupta <an...@apache.org>
Committed: Thu Apr 21 13:42:26 2016 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 5 +++--
solr/core/src/java/org/apache/solr/cloud/LeaderElector.java | 4 +---
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55ac1ab9/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f360730..014fccd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -85,8 +85,9 @@ Bug Fixes
* SOLR-8656: PeerSync should use same nUpdates everywhere. (Ramsey Haddad via Mark Miller)
-* SOLR-8697: Scope ZK election nodes by session to prevent elections from interfering with each other
- and other small LeaderElector improvements. (Scott Blum via Mark Miller)
+* SOLR-8697, SOLR-8837: Scope ZK election nodes by session to prevent elections from interfering with each other
+ and other small LeaderElector improvements. (Scott Blum via Mark Miller, Alan
+ Woodward)
======================= 5.5.0 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55ac1ab9/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
index aa1ace2..74b3ff1 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
@@ -18,7 +18,6 @@ package org.apache.solr.cloud;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
@@ -27,7 +26,6 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
import org.apache.solr.cloud.ZkController.ContextKey;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -116,7 +114,7 @@ public class LeaderElector {
// If any double-registrations exist for me, remove all but this latest one!
// TODO: can we even get into this state?
- String prefix = zkClient.getSolrZooKeeper().getSessionId() + "-" + context.id;
+ String prefix = zkClient.getSolrZooKeeper().getSessionId() + "-" + context.id + "-";
Iterator<String> it = seqs.iterator();
while (it.hasNext()) {
String elec = it.next();