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 2014/12/01 17:32:36 UTC
svn commit: r1642708 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
Author: shalin
Date: Mon Dec 1 16:32:36 2014
New Revision: 1642708
URL: http://svn.apache.org/r1642708
Log:
SOLR-6554: Moved performance test factors into constants
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1642708&r1=1642707&r2=1642708&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Mon Dec 1 16:32:36 2014
@@ -909,11 +909,13 @@ public class OverseerTest extends SolrTe
mockController = new MockZKController(server.getZkAddress(), "node1");
- for (int i=0; i<100; i++) {
+ final int MAX_COLLECTIONS = 10, MAX_CORES = 10, MAX_STATE_CHANGES = 20000, STATE_FORMAT = 2;
+
+ for (int i=0; i<MAX_COLLECTIONS; i++) {
ZkNodeProps m = new ZkNodeProps(Overseer.QUEUE_OPERATION, CollectionParams.CollectionAction.CREATE.toLower(),
"name", "perf" + i,
ZkStateReader.NUM_SHARDS_PROP, "1",
- "stateFormat", "2",
+ "stateFormat", String.valueOf(STATE_FORMAT),
ZkStateReader.REPLICATION_FACTOR, "1",
ZkStateReader.MAX_SHARDS_PER_NODE, "1"
);
@@ -922,7 +924,7 @@ public class OverseerTest extends SolrTe
controllerClient.makePath("/collections/perf" + i, true);
}
- for (int i = 0, j = 0, k = 0; i < 20000; i++, j++, k++) {
+ for (int i = 0, j = 0, k = 0; i < MAX_STATE_CHANGES; i++, j++, k++) {
ZkNodeProps m = new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.STATE.toLower(),
ZkStateReader.STATE_PROP, ZkStateReader.RECOVERING,
ZkStateReader.NODE_NAME_PROP, "node1",
@@ -934,8 +936,8 @@ public class OverseerTest extends SolrTe
+ "/solr/");
DistributedQueue q = Overseer.getInQueue(controllerClient);
q.offer(ZkStateReader.toJSON(m));
- if (j == 99) j = 0;
- if (k == 9) k = 0;
+ if (j >= MAX_COLLECTIONS - 1) j = 0;
+ if (k >= MAX_CORES - 1) k = 0;
if (i > 0 && i % 100 == 0) log.info("Published {} items", i);
}