lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1657489 - in /lucene/dev/branches/lucene_solr_5_0: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
Date Thu, 05 Feb 2015 06:42:07 GMT
Author: shalin
Date: Thu Feb  5 06:42:06 2015
New Revision: 1657489

URL: http://svn.apache.org/r1657489
Log:
SOLR-6227: Avoid spurious failures of ChaosMonkeySafeLeaderTest by ensuring there's at least
one jetty to kill

Modified:
    lucene/dev/branches/lucene_solr_5_0/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java

Modified: lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt?rev=1657489&r1=1657488&r2=1657489&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt Thu Feb  5 06:42:06 2015
@@ -762,7 +762,10 @@ Other Changes
 
 * SOLR-7020: 'bin/solr start' should automatically use an SSL-enabled alternate jetty
   configuration file when in SSL mode, eliminating the need for manual jetty.xml edits.
-  (Steve Rowe) 
+  (Steve Rowe)
+
+* SOLR-6227: Avoid spurious failures of ChaosMonkeySafeLeaderTest by ensuring there's
+  at least one jetty to kill. (shalin)
 
 ==================  4.10.3 ==================
 

Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java?rev=1657489&r1=1657488&r2=1657489&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
(original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
Thu Feb  5 06:42:06 2015
@@ -96,7 +96,9 @@ public class ChaosMonkeySafeLeaderTest e
       sliceCount = random().nextInt(TEST_NIGHTLY ? 5 : 3) + 1;
     }
     if (shardCount == -1) {
-      shardCount = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2);
+      // we make sure that there's at least one shard with more than one replica
+      // so that the ChaosMonkey has something to kill
+      shardCount = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2) + 1;
     }
   }
   



Mime
View raw message