You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2016/12/29 12:04:48 UTC
[1/2] lucene-solr:master: tests: speed up very slow test
Repository: lucene-solr
Updated Branches:
refs/heads/master b4de6288f -> fa959ad25
tests: speed up very slow test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c58eaa1a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c58eaa1a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c58eaa1a
Branch: refs/heads/master
Commit: c58eaa1a49bf518f3b0f70701ffd31f0cca79c17
Parents: b4de628
Author: markrmiller <ma...@apache.org>
Authored: Wed Dec 28 08:36:08 2016 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Thu Dec 29 06:22:58 2016 -0500
----------------------------------------------------------------------
.../apache/solr/cloud/CdcrBootstrapTest.java | 25 ++++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c58eaa1a/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java b/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
index aca5e0b..6959bd8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
@@ -76,11 +76,11 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
.withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory")
.process(source.getSolrClient());
- // index 10000 docs with a hard commit every 1000 documents
CloudSolrClient sourceSolrClient = source.getSolrClient();
sourceSolrClient.setDefaultCollection("cdcr-source");
+ int docs = (TEST_NIGHTLY ? 100 : 10);
int numDocs = 0;
- for (int k = 0; k < 100; k++) {
+ for (int k = 0; k < docs; k++) {
UpdateRequest req = new UpdateRequest();
for (; numDocs < (k + 1) * 100; numDocs++) {
SolrInputDocument doc = new SolrInputDocument();
@@ -89,7 +89,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
req.add(doc);
}
req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
- System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+ System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
req.process(sourceSolrClient);
}
@@ -170,11 +170,11 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
.withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory")
.process(source.getSolrClient());
- // index 10000 docs with a hard commit every 1000 documents
CloudSolrClient sourceSolrClient = source.getSolrClient();
sourceSolrClient.setDefaultCollection("cdcr-source");
+ int docs = (TEST_NIGHTLY ? 100 : 10);
int numDocs = 0;
- for (int k = 0; k < 100; k++) {
+ for (int k = 0; k < docs; k++) {
UpdateRequest req = new UpdateRequest();
for (; numDocs < (k + 1) * 100; numDocs++) {
SolrInputDocument doc = new SolrInputDocument();
@@ -183,7 +183,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
req.add(doc);
}
req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
- System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+ System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
req.process(sourceSolrClient);
}
@@ -209,7 +209,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
cdcrDisableBuffer(sourceSolrClient);
int c = 0;
- for (int k = 0; k < 100; k++) {
+ for (int k = 0; k < 10; k++) {
UpdateRequest req = new UpdateRequest();
for (; c < (k + 1) * 100; c++, numDocs++) {
SolrInputDocument doc = new SolrInputDocument();
@@ -256,11 +256,11 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
.withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory")
.process(source.getSolrClient());
- // index 10000 docs with a hard commit every 1000 documents
CloudSolrClient sourceSolrClient = source.getSolrClient();
sourceSolrClient.setDefaultCollection("cdcr-source");
+ int docs = (TEST_NIGHTLY ? 100 : 10);
int numDocs = 0;
- for (int k = 0; k < 100; k++) {
+ for (int k = 0; k < docs; k++) {
UpdateRequest req = new UpdateRequest();
for (; numDocs < (k + 1) * 100; numDocs++) {
SolrInputDocument doc = new SolrInputDocument();
@@ -269,7 +269,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
req.add(doc);
}
req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
- System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+ System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
req.process(sourceSolrClient);
}
@@ -286,9 +286,8 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
cdcrStart(targetSolrClient);
cdcrStart(sourceSolrClient);
-
int c = 0;
- for (int k = 0; k < 100; k++) {
+ for (int k = 0; k < docs; k++) {
UpdateRequest req = new UpdateRequest();
for (; c < (k + 1) * 100; c++, numDocs++) {
SolrInputDocument doc = new SolrInputDocument();
@@ -297,7 +296,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
req.add(doc);
}
req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
- System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+ System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
req.process(sourceSolrClient);
}
[2/2] lucene-solr:master: tests: speed up non nightly run
Posted by ma...@apache.org.
tests: speed up non nightly run
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fa959ad2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fa959ad2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fa959ad2
Branch: refs/heads/master
Commit: fa959ad25d2460ebb41fae6bcf496a5ce785e989
Parents: c58eaa1
Author: markrmiller <ma...@apache.org>
Authored: Thu Dec 29 06:42:14 2016 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Thu Dec 29 06:42:14 2016 -0500
----------------------------------------------------------------------
solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fa959ad2/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
index 80b717e..52ab3a3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
@@ -132,7 +132,7 @@ public class TestStressLiveNodes extends SolrCloudTestCase {
public void testStress() throws Exception {
// do many iters, so we have "bursts" of adding nodes that we then check
- final int numIters = atLeast(1000);
+ final int numIters = atLeast(TEST_NIGHTLY ? 1000 : 100);
for (int iter = 0; iter < numIters; iter++) {
// sanity check that ZK says there is in fact 1 live node