Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 40F2610C94 for ; Sat, 2 Nov 2013 00:46:16 +0000 (UTC) Received: (qmail 26221 invoked by uid 500); 2 Nov 2013 00:46:16 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 26214 invoked by uid 99); 2 Nov 2013 00:46:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Nov 2013 00:46:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Nov 2013 00:46:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0447D238896F; Sat, 2 Nov 2013 00:45:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1538111 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/test-framework/ solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Date: Sat, 02 Nov 2013 00:45:54 -0000 To: commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131102004555.0447D238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markrmiller Date: Sat Nov 2 00:45:54 2013 New Revision: 1538111 URL: http://svn.apache.org/r1538111 Log: SOLR-5417: The ChaosMonkey tests are not causing any disruption. Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/solr/ (props changed) lucene/dev/branches/branch_4x/solr/test-framework/ (props changed) lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1538111&r1=1538110&r2=1538111&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original) +++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Sat Nov 2 00:45:54 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> entries = slice.getReplicasMap().entrySet(); + for (Entry entry : entries) { + Replica replica = entry.getValue(); + if (replica.getStr(ZkStateReader.BASE_URL_PROP).contains(":" + port)) { List list = shardToJetty.get(slice.getName()); if (list == null) { list = new ArrayList(); @@ -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);