You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/04/18 07:31:27 UTC
svn commit: r1588416 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/ZkController.java
Author: shalin
Date: Fri Apr 18 05:31:27 2014
New Revision: 1588416
URL: http://svn.apache.org/r1588416
Log:
SOLR-5993: ZkController can warn about shard leader conflict even after the conflict is resolved
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1588416&r1=1588415&r2=1588416&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Apr 18 05:31:27 2014
@@ -48,6 +48,9 @@ Bug Fixes
was an exception while trying to register as the leader.
(Mark Miller, Alan Woodward)
+* SOLR-5993: ZkController can warn about shard leader conflict even after the conflict
+ is resolved. (Gregory Chanan via shalin)
+
Other Changes
---------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1588416&r1=1588415&r2=1588416&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Fri Apr 18 05:31:27 2014
@@ -856,19 +856,18 @@ public final class ZkController {
+ cloudDesc.getShardId() + " our state says:"
+ clusterStateLeaderUrl + " but zookeeper says:" + leaderUrl);
}
- Thread.sleep(msInSec);
tries++;
- clusterStateLeaderUrl = zkStateReader.getLeaderUrl(collection, shardId,
- timeoutms);
- leaderUrl = getLeaderProps(collection, cloudDesc.getShardId(), timeoutms)
- .getCoreUrl();
-
if (tries % 30 == 0) {
String warnMsg = String.format(Locale.ENGLISH, "Still seeing conflicting information about the leader "
+ "of shard %s for collection %s after %d seconds; our state says %s, but ZooKeeper says %s",
cloudDesc.getShardId(), collection, tries, clusterStateLeaderUrl, leaderUrl);
log.warn(warnMsg);
}
+ Thread.sleep(msInSec);
+ clusterStateLeaderUrl = zkStateReader.getLeaderUrl(collection, shardId,
+ timeoutms);
+ leaderUrl = getLeaderProps(collection, cloudDesc.getShardId(), timeoutms)
+ .getCoreUrl();
}
} catch (Exception e) {