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/18 00:00:34 UTC
svn commit: r1578654 - in /lucene/dev/branches/lucene_solr_4_7: ./ 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 23:00:34 2014
New Revision: 1578654
URL: http://svn.apache.org/r1578654
Log:
SOLR-5770: Further fixes and SSL migration test.
Added:
lucene/dev/branches/lucene_solr_4_7/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/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Modified: lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1578654&r1=1578653&r2=1578654&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/Overseer.java Mon Mar 17 23:00:34 2014
@@ -668,13 +668,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/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1578654&r1=1578653&r2=1578654&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Mon Mar 17 23:00:34 2014
@@ -976,7 +976,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);
@@ -1085,7 +1085,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();
@@ -1173,7 +1173,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()
@@ -1184,10 +1184,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();
}
}
@@ -1422,7 +1422,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();
@@ -1459,7 +1459,7 @@ public class OverseerCollectionProcessor
sendShardRequest(targetLeader.getNodeName(), params);
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/lucene_solr_4_7/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/lucene_solr_4_7/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java?p2=lucene/dev/branches/lucene_solr_4_7/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=1578654&rev=1578654&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java Mon Mar 17 23:00:34 2014
@@ -38,7 +38,6 @@ import org.apache.solr.common.params.Col
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.util.SSLTestConfig;
-import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.lucene.util.LuceneTestCase.Slow;
/**
@@ -47,8 +46,10 @@ import org.apache.lucene.util.LuceneTest
* off in the cluster.
*/
@Slow
-@SuppressSSL
public class SSLMigrationTest extends AbstractFullDistribZkTestBase {
+ static {
+ ALLOW_SSL = false;
+ }
@Override
public void doTest() throws Exception {