You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/06/02 18:33:21 UTC
[1/2] lucene-solr:master: SOLR-9182: SuppressSSL on some tests where
it's non to cause OOM
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 50feae82a -> 7f8213936
refs/heads/master b97727518 -> 1eb6c9f81
SOLR-9182: SuppressSSL on some tests where it's non to cause OOM
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1eb6c9f8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1eb6c9f8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1eb6c9f8
Branch: refs/heads/master
Commit: 1eb6c9f816fa09acf2d55370876f79218c0328c3
Parents: b977275
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Jun 2 11:27:49 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Jun 2 11:27:59 2016 -0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/DistributedIntervalFacetingTest.java | 2 ++
.../src/test/org/apache/solr/cloud/DistribCursorPagingTest.java | 2 ++
.../apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1eb6c9f8/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
index cf1e9b1..8c0682b 100644
--- a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
+++ b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
@@ -21,6 +21,7 @@ import java.util.Comparator;
import java.util.List;
import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.IntervalFacet.Count;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -29,6 +30,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
@Slow
+@SuppressSSL(bugUrl="https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
public class DistributedIntervalFacetingTest extends
BaseDistributedSearchTestCase {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1eb6c9f8/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
index d7875d8..d9d64e5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
@@ -21,6 +21,7 @@ import com.carrotsearch.randomizedtesting.annotations.Seed;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.SentinelIntSet;
import org.apache.lucene.util.TestUtil;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.CursorPagingTest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.LukeRequest;
@@ -61,6 +62,7 @@ import java.util.Map;
* @see CursorPagingTest
*/
@Slow
+@SuppressSSL(bugUrl="https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1eb6c9f8/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
index 89f8aeb..0e8e4dc 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
@@ -37,6 +37,7 @@ import java.util.Map;
import java.util.Random;
import org.apache.lucene.util.TestUtil;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -67,6 +68,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
*/
+@SuppressSSL(bugUrl="https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
[2/2] lucene-solr:branch_6x: SOLR-9182: SuppressSSL on some tests
where it's non to cause OOM
Posted by ho...@apache.org.
SOLR-9182: SuppressSSL on some tests where it's non to cause OOM
(cherry picked from commit 1eb6c9f816fa09acf2d55370876f79218c0328c3)
Conflicts:
solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7f821393
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7f821393
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7f821393
Branch: refs/heads/branch_6x
Commit: 7f821393690624e4d8db4bee45c0645785a72d73
Parents: 50feae8
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Jun 2 11:27:49 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Jun 2 11:30:28 2016 -0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/DistributedIntervalFacetingTest.java | 2 ++
.../src/test/org/apache/solr/cloud/DistribCursorPagingTest.java | 2 ++
.../apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f821393/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
index cf1e9b1..8c0682b 100644
--- a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
+++ b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
@@ -21,6 +21,7 @@ import java.util.Comparator;
import java.util.List;
import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.IntervalFacet.Count;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -29,6 +30,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
@Slow
+@SuppressSSL(bugUrl="https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
public class DistributedIntervalFacetingTest extends
BaseDistributedSearchTestCase {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f821393/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
index d7875d8..d9d64e5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
@@ -21,6 +21,7 @@ import com.carrotsearch.randomizedtesting.annotations.Seed;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.SentinelIntSet;
import org.apache.lucene.util.TestUtil;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.CursorPagingTest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.LukeRequest;
@@ -61,6 +62,7 @@ import java.util.Map;
* @see CursorPagingTest
*/
@Slow
+@SuppressSSL(bugUrl="https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f821393/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
index c1008bb..8f87507 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
@@ -30,6 +30,7 @@ import java.util.Random;
import java.util.Set;
import org.apache.lucene.util.TestUtil;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.cloud.SolrCloudTestCase;
import static org.apache.solr.cloud.TestTolerantUpdateProcessorCloud.assertUpdateTolerantErrors;
import static org.apache.solr.cloud.TestTolerantUpdateProcessorCloud.addErr;
@@ -83,6 +84,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
*/
+@SuppressSSL(bugUrl="https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());