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/03/17 23:45:29 UTC
svn commit: r1578651 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/cloud/
solr/core/src/test/org/apache/solr/cloud/
Author: markrmiller
Date: Mon Mar 17 22:45:28 2014
New Revision: 1578651
URL: http://svn.apache.org/r1578651
Log:
SOLR-5770: Further fixes and SSL migration test.
Added:
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
- copied, changed from r1578635, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1578651&r1=1578650&r2=1578651&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java Mon Mar 17 22:45:28 2014
@@ -783,13 +783,13 @@ public class Overseer {
if (slices != null) {
for (Slice slice : slices) {
for (Replica replica : slice.getReplicas()) {
- 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 = message.getStr(ZkStateReader.BASE_URL_PROP);
+ String msgNodeName = message.getStr(ZkStateReader.NODE_NAME_PROP);
String msgCore = message.getStr(ZkStateReader.CORE_NAME_PROP);
- if (baseUrl.equals(msgBaseUrl) && core.equals(msgCore)) {
+ if (nodeName.equals(msgNodeName) && core.equals(msgCore)) {
return replica.getName();
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1578651&r1=1578650&r2=1578651&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Mon Mar 17 22:45:28 2014
@@ -1009,7 +1009,7 @@ public class OverseerCollectionProcessor
for (String subShardName : subShardNames) {
// wait for parent leader to acknowledge the sub-shard core
log.info("Asking parent leader to wait for: " + subShardName + " to be alive on: " + nodeName);
- String coreNodeName = waitForCoreNodeName(collection, zkStateReader.getBaseUrlForNodeName(nodeName), subShardName);
+ String coreNodeName = waitForCoreNodeName(collection, nodeName, subShardName);
CoreAdminRequest.WaitForState cmd = new CoreAdminRequest.WaitForState();
cmd.setCoreName(subShardName);
cmd.setNodeName(nodeName);
@@ -1137,7 +1137,7 @@ public class OverseerCollectionProcessor
sendShardRequest(subShardNodeName, params);
- String coreNodeName = waitForCoreNodeName(collection, zkStateReader.getBaseUrlForNodeName(subShardNodeName), shardName);
+ String coreNodeName = waitForCoreNodeName(collection, subShardNodeName, shardName);
// wait for the replicas to be seen as active on sub shard leader
log.info("Asking sub shard leader to wait for: " + shardName + " to be alive on: " + subShardNodeName);
CoreAdminRequest.WaitForState cmd = new CoreAdminRequest.WaitForState();
@@ -1232,7 +1232,7 @@ public class OverseerCollectionProcessor
}
}
- private String waitForCoreNodeName(DocCollection collection, String msgBaseUrl, String msgCore) {
+ private String waitForCoreNodeName(DocCollection collection, String msgNodeName, String msgCore) {
int retryCount = 320;
while (retryCount-- > 0) {
Map<String,Slice> slicesMap = zkStateReader.getClusterState()
@@ -1243,10 +1243,10 @@ public class OverseerCollectionProcessor
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);
- if (baseUrl.equals(msgBaseUrl) && core.equals(msgCore)) {
+ if (nodeName.equals(msgNodeName) && core.equals(msgCore)) {
return replica.getName();
}
}
@@ -1530,7 +1530,7 @@ public class OverseerCollectionProcessor
String tempCollectionReplica1 = tempSourceCollectionName + "_" + tempSourceSlice.getName() + "_replica1";
String coreNodeName = waitForCoreNodeName(clusterState.getCollection(tempSourceCollectionName),
- zkStateReader.getBaseUrlForNodeName(sourceLeader.getNodeName()), tempCollectionReplica1);
+ sourceLeader.getNodeName(), tempCollectionReplica1);
// wait for the replicas to be seen as active on temp source leader
log.info("Asking source leader to wait for: " + tempCollectionReplica1 + " to be alive on: " + sourceLeader.getNodeName());
CoreAdminRequest.WaitForState cmd = new CoreAdminRequest.WaitForState();
@@ -1578,7 +1578,7 @@ public class OverseerCollectionProcessor
completeAsyncRequest(asyncId, requestMap, results);
coreNodeName = waitForCoreNodeName(clusterState.getCollection(tempSourceCollectionName),
- zkStateReader.getBaseUrlForNodeName(targetLeader.getNodeName()), tempCollectionReplica2);
+ targetLeader.getNodeName(), tempCollectionReplica2);
// wait for the replicas to be seen as active on temp source leader
log.info("Asking temp source leader to wait for: " + tempCollectionReplica2 + " to be alive on: " + targetLeader.getNodeName());
cmd = new CoreAdminRequest.WaitForState();
Copied: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java (from r1578635, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java?p2=lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java&p1=lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java&r1=1578635&r2=1578651&rev=1578651&view=diff
==============================================================================
(empty)