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 2014/02/24 18:06:26 UTC
svn commit: r1571352 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/ZkController.java solr/solrj/
solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
Author: markrmiller
Date: Mon Feb 24 17:06:26 2014
New Revision: 1571352
URL: http://svn.apache.org/r1571352
Log:
SOLR-5770: All attempts to match a SolrCore with it's state in clusterstate.json should be done with the CoreNodeName.
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
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.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=1571352&r1=1571351&r2=1571352&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Feb 24 17:06:26 2014
@@ -354,6 +354,9 @@ Bug Fixes
* SOLR-5448: ShowFileRequestHandler treats everything as Directory, when in
Cloud-Mode. (Erick Erickson, steffkes)
+* SOLR-5770: All attempts to match a SolrCore with it's state in clusterstate.json
+ should be done with the CoreNodeName. (Steve Davids via Mark Miller)
+
Optimizations
----------------------
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=1571352&r1=1571351&r2=1571352&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 Mon Feb 24 17:06:26 2014
@@ -1049,7 +1049,7 @@ public final class ZkController {
final CloudDescriptor cloudDesc = desc.getCloudDescriptor();
- final String shardId = state.getShardId(getBaseUrl(), desc.getName());
+ final String shardId = state.getShardId(getNodeName(), desc.getName());
if (shardId != null) {
cloudDesc.setShardId(shardId);
@@ -1256,13 +1256,13 @@ public final class ZkController {
for (Replica replica : slice.getReplicas()) {
// TODO: for really large clusters, we could 'index' on this
- String baseUrl = replica.getStr(ZkStateReader.BASE_URL_PROP);
+ String nodeName = replica.getStr(ZkStateReader.NODE_NAME_PROP);
String core = replica.getStr(ZkStateReader.CORE_NAME_PROP);
- String msgBaseUrl = getBaseUrl();
+ String msgNodeName = getNodeName();
String msgCore = descriptor.getName();
- if (baseUrl.equals(msgBaseUrl) && core.equals(msgCore)) {
+ if (nodeName.equals(msgNodeName) && core.equals(msgCore)) {
descriptor.getCloudDescriptor()
.setCoreNodeName(replica.getName());
return;
@@ -1282,7 +1282,7 @@ public final class ZkController {
log.info("waiting to find shard id in clusterstate for " + cd.getName());
int retryCount = 320;
while (retryCount-- > 0) {
- final String shardId = zkStateReader.getClusterState().getShardId(getBaseUrl(), cd.getName());
+ final String shardId = zkStateReader.getClusterState().getShardId(getNodeName(), cd.getName());
if (shardId != null) {
cd.getCloudDescriptor().setShardId(shardId);
return;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1571352&r1=1571351&r2=1571352&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Mon Feb 24 17:06:26 2014
@@ -199,15 +199,15 @@ public class ClusterState implements JSO
return Collections.unmodifiableSet(liveNodes);
}
- public String getShardId(String baseUrl, String coreName) {
+ public String getShardId(String nodeName, String coreName) {
// System.out.println("###### getShardId(" + baseUrl + "," + coreName + ") in " + collectionStates);
for (DocCollection coll : collectionStates.values()) {
for (Slice slice : coll.getSlices()) {
for (Replica replica : slice.getReplicas()) {
// TODO: for really large clusters, we could 'index' on this
- String rbaseUrl = replica.getStr(ZkStateReader.BASE_URL_PROP);
+ String rnodeName = replica.getStr(ZkStateReader.NODE_NAME_PROP);
String rcore = replica.getStr(ZkStateReader.CORE_NAME_PROP);
- if (baseUrl.equals(rbaseUrl) && coreName.equals(rcore)) {
+ if (nodeName.equals(rnodeName) && coreName.equals(rcore)) {
return slice.getName();
}
}