Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6419: The ChaosMonkey tests should use fewers jetty instances on non nightly runs. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1620167 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-08-24 17:36:38 +00:00
parent ed813910c9
commit acee95a8d7
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
View File

@ -107,8 +107,15 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
public ChaosMonkeyNothingIsSafeTest() { public ChaosMonkeyNothingIsSafeTest() {
super(); super();
sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "2")); sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "-1"));
shardCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "7")); shardCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "-1"));
if (sliceCount == -1) {
sliceCount = random().nextInt(TEST_NIGHTLY ? 5 : 3) + 1;
}
if (shardCount == -1) {
shardCount = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2);
}
} }
@Override @Override

12
solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
View File

@ -20,7 +20,6 @@ package org.apache.solr.cloud;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.lucene.util.LuceneTestCase.BadApple;
import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.impl.CloudSolrServer; import org.apache.solr.client.solrj.impl.CloudSolrServer;
@ -88,8 +87,15 @@ public class ChaosMonkeySafeLeaderTest extends AbstractFullDistribZkTestBase {
public ChaosMonkeySafeLeaderTest() { public ChaosMonkeySafeLeaderTest() {
super(); super();
sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "3")); sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "-1"));
shardCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "12")); shardCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "-1"));
if (sliceCount == -1) {
sliceCount = random().nextInt(TEST_NIGHTLY ? 5 : 3) + 1;
}
if (shardCount == -1) {
shardCount = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2);
}
} }
@Override @Override