You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/02/05 07:36:00 UTC
svn commit: r1657488 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
Author: shalin
Date: Thu Feb 5 06:36:00 2015
New Revision: 1657488
URL: http://svn.apache.org/r1657488
Log:
SOLR-6227: Avoid spurious failures of ChaosMonkeySafeLeaderTest by ensuring there's at least one jetty to kill
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1657488&r1=1657487&r2=1657488&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Feb 5 06:36:00 2015
@@ -819,7 +819,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/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java?rev=1657488&r1=1657487&r2=1657488&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java Thu Feb 5 06:36:00 2015
@@ -92,7 +92,9 @@ public class ChaosMonkeySafeLeaderTest e
int numShards = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "-1"));
if (numShards == -1) {
- numShards = 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
+ numShards = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2) + 1;
}
fixShardCount(numShards);
}