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 2013/11/02 01:44:29 UTC
svn commit: r1538110 -
/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Author: markrmiller
Date: Sat Nov 2 00:44:29 2013
New Revision: 1538110
URL: http://svn.apache.org/r1538110
Log:
SOLR-5417: The ChaosMonkey tests are not causing any disruption.
Modified:
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1538110&r1=1538109&r2=1538110&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Sat Nov 2 00:44:29 2013
@@ -67,6 +67,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -547,8 +548,10 @@ public abstract class AbstractFullDistri
nextJetty:
for (Slice slice : coll.getSlices()) {
- for (Replica replica : slice.getReplicas()) {
- if (replica.getNodeName().contains(":" + port + "_")) {
+ Set<Entry<String,Replica>> entries = slice.getReplicasMap().entrySet();
+ for (Entry<String,Replica> entry : entries) {
+ Replica replica = entry.getValue();
+ if (replica.getStr(ZkStateReader.BASE_URL_PROP).contains(":" + port)) {
List<CloudJettyRunner> list = shardToJetty.get(slice.getName());
if (list == null) {
list = new ArrayList<CloudJettyRunner>();
@@ -559,7 +562,7 @@ public abstract class AbstractFullDistri
cjr.jetty = jetty;
cjr.info = replica;
cjr.nodeName = replica.getStr(ZkStateReader.NODE_NAME_PROP);
- cjr.coreNodeName = replica.getNodeName();
+ cjr.coreNodeName = entry.getKey();
cjr.url = replica.getStr(ZkStateReader.BASE_URL_PROP) + "/" + replica.getStr(ZkStateReader.CORE_NAME_PROP);
cjr.client = findClientByPort(port, theClients);
list.add(cjr);