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 2020/07/25 22:15:25 UTC
[lucene-solr] 12/16: @322 Start processing the test long tail.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 8c65f49be7f9758b786ba1a30ce98e20b5844406
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Jul 24 11:49:12 2020 -0500
@322 Start processing the test long tail.
---
.../legacy/facet/LegacyQueryFacetTest.java | 2 ++
.../dataimport/TestContentStreamDataSource.java | 2 ++
.../org/apache/solr/ltr/TestLTRQParserExplain.java | 2 ++
.../test/org/apache/solr/ltr/TestLTRWithFacet.java | 2 ++
.../test/org/apache/solr/ltr/TestLTRWithSort.java | 2 ++
.../solr/ltr/TestParallelWeightCreation.java | 2 ++
.../solr/ltr/feature/TestEdisMaxSolrFeature.java | 2 ++
.../solr/ltr/feature/TestFeatureLogging.java | 2 ++
.../solr/ltr/feature/TestFieldLengthFeature.java | 2 ++
.../solr/ltr/feature/TestFieldValueFeature.java | 2 ++
.../solr/ltr/feature/TestFilterSolrFeature.java | 2 ++
.../solr/ltr/feature/TestNoMatchSolrFeature.java | 2 ++
.../solr/ltr/feature/TestOriginalScoreFeature.java | 2 ++
.../solr/ltr/feature/TestRankingFeature.java | 3 ++-
.../solr/ltr/feature/TestUserTermScoreWithQ.java | 2 ++
.../solr/ltr/feature/TestUserTermScorerQuery.java | 2 ++
.../solr/ltr/feature/TestUserTermScorereQDF.java | 2 ++
.../apache/solr/ltr/feature/TestValueFeature.java | 2 ++
.../apache/solr/ltr/model/TestAdapterModel.java | 2 ++
.../solr/ltr/model/TestDefaultWrapperModel.java | 2 ++
.../org/apache/solr/ltr/model/TestLinearModel.java | 2 ++
.../ltr/model/TestMultipleAdditiveTreesModel.java | 2 ++
.../solr/ltr/model/TestNeuralNetworkModel.java | 2 ++
.../store/rest/TestModelManagerPersistence.java | 2 ++
.../java/org/apache/solr/core/CoreContainer.java | 2 +-
.../src/java/org/apache/solr/core/SolrCore.java | 19 ++++++++-----------
.../solr/DistributedIntervalFacetingTest.java | 2 ++
.../org/apache/solr/TestDistributedGrouping.java | 2 ++
.../apache/solr/TestDistributedMissingSort.java | 2 ++
.../test/org/apache/solr/cloud/RecoveryZkTest.java | 9 +++++++--
.../solr/cloud/TestCloudPseudoReturnFields.java | 2 ++
.../component/DistributedFacetPivotSmallTest.java | 4 +++-
.../component/DistributedTermsComponentTest.java | 6 ++++++
.../handler/component/SpellCheckComponentTest.java | 2 ++
.../TestDistributedStatsComponentCardinality.java | 4 +++-
.../apache/solr/rest/schema/TestBulkSchemaAPI.java | 2 ++
.../search/facet/SpatialHeatmapFacetsTest.java | 2 ++
.../solr/search/stats/TestDefaultStatsCache.java | 2 ++
.../search/stats/TestExactSharedStatsCache.java | 3 +++
.../apache/solr/common/cloud/ZkStateReader.java | 7 ++++---
.../solr/client/solrj/TestLBHttpSolrClient.java | 22 +++++++++-------------
.../java/org/apache/solr/util/RestTestHarness.java | 4 ++--
42 files changed, 110 insertions(+), 35 deletions(-)
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.java
index 92721b2..0d02cbf 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.java
@@ -19,9 +19,11 @@ package org.apache.solr.analytics.legacy.facet;
import java.util.ArrayList;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.BeforeClass;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class LegacyQueryFacetTest extends LegacyAbstractAnalyticsFacetTest {
static String fileName = "queryFacets.txt";
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
index 34e50e0..e16dcd7 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
@@ -17,6 +17,7 @@
package org.apache.solr.handler.dataimport;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.DirectXmlRequest;
@@ -40,6 +41,7 @@ import java.util.Properties;
*
* @since solr 1.4
*/
+@LuceneTestCase.Nightly
public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCase {
private static final String CONF_DIR = "dih/solr/collection1/conf/";
private static final String ROOT_DIR = "dih/solr/";
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java
index 14fb7e1..1defb7e 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java
@@ -16,12 +16,14 @@
*/
package org.apache.solr.ltr;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.model.LinearModel;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestLTRQParserExplain extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
index 31c2b76..f74b73d 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
@@ -17,6 +17,7 @@
package org.apache.solr.ltr;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.feature.SolrFeature;
import org.apache.solr.ltr.model.LinearModel;
@@ -24,6 +25,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestLTRWithFacet extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
index 708fdc8..25ee81a 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
@@ -17,6 +17,7 @@
package org.apache.solr.ltr;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.feature.SolrFeature;
import org.apache.solr.ltr.model.LinearModel;
@@ -24,6 +25,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestLTRWithSort extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
index 46330c9..c84d0da 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
@@ -16,9 +16,11 @@
*/
package org.apache.solr.ltr;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestParallelWeightCreation extends TestRerankBase{
@Test
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
index e162c8c..b4828f4 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.ltr.feature;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.model.LinearModel;
@@ -23,6 +24,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestEdisMaxSolrFeature extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java
index e7af250..7043d10 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.ltr.feature;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.FeatureLoggerTestUtils;
import org.apache.solr.ltr.TestRerankBase;
@@ -25,6 +26,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestFeatureLogging extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
index b913d1b..2134f78 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
@@ -18,6 +18,7 @@ package org.apache.solr.ltr.feature;
import java.util.LinkedHashMap;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.model.LinearModel;
@@ -25,6 +26,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestFieldLengthFeature extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
index 108044b..00f7583 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
@@ -18,6 +18,7 @@ package org.apache.solr.ltr.feature;
import java.util.LinkedHashMap;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.FeatureLoggerTestUtils;
import org.apache.solr.ltr.TestRerankBase;
@@ -26,6 +27,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestFieldValueFeature extends TestRerankBase {
private static final float FIELD_VALUE_FEATURE_DEFAULT_VAL = 0.0f;
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
index d42176e..909acca 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.ltr.feature;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.FeatureLoggerTestUtils;
import org.apache.solr.ltr.TestRerankBase;
@@ -25,6 +26,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestFilterSolrFeature extends TestRerankBase {
@Before
public void before() throws Exception {
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
index 48c1262..2421e6f 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
@@ -19,6 +19,7 @@ package org.apache.solr.ltr.feature;
import java.util.ArrayList;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.common.util.Utils;
import org.apache.solr.ltr.FeatureLoggerTestUtils;
@@ -29,6 +30,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestNoMatchSolrFeature extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
index 8ff5684..422dfa6 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.Utils;
@@ -30,6 +31,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestOriginalScoreFeature extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
index eab9610..f32c5a3 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
@@ -18,6 +18,7 @@ package org.apache.solr.ltr.feature;
import java.util.LinkedHashMap;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.model.LinearModel;
@@ -25,7 +26,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
+@LuceneTestCase.Nightly
public class TestRankingFeature extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
index 9b7e768..17b84d1 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.ltr.feature;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.model.LinearModel;
@@ -23,6 +24,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestUserTermScoreWithQ extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
index 3b6b93d..0f7c337 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.ltr.feature;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.model.LinearModel;
@@ -23,6 +24,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestUserTermScorerQuery extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
index b5882d5..f95d9e4 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.ltr.feature;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.model.LinearModel;
@@ -23,6 +24,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestUserTermScorereQDF extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
index 8a3b014..52f4e43 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
@@ -18,6 +18,7 @@ package org.apache.solr.ltr.feature;
import java.util.LinkedHashMap;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.model.LinearModel;
@@ -25,6 +26,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestValueFeature extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java
index b0f8b1f..a3be684 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java
@@ -31,6 +31,7 @@ import java.util.Map;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Explanation;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.ltr.TestRerankBase;
@@ -42,6 +43,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestAdapterModel extends TestRerankBase {
private static int numDocs = 0;
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java
index 00ed14d..3770636 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java
@@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.feature.Feature;
@@ -35,6 +36,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestDefaultWrapperModel extends TestRerankBase {
final private static String featureStoreName = "test";
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java
index d5950e6..e922382 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrException;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.feature.Feature;
@@ -33,6 +34,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestLinearModel extends TestRerankBase {
public static LTRScoringModel createLinearModel(String name, List<Feature> features,
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
index 8cb59f2..c3a8f5b 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.ltr.model;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
import org.junit.After;
@@ -24,6 +25,7 @@ import org.junit.Test;
import static org.hamcrest.core.StringContains.containsString;
+@LuceneTestCase.Nightly
public class TestMultipleAdditiveTreesModel extends TestRerankBase {
@Before
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java
index 045c625..682b278 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.lucene.search.Explanation;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.feature.Feature;
import org.apache.solr.ltr.norm.IdentityNormalizer;
@@ -32,6 +33,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestNeuralNetworkModel extends TestRerankBase {
public static LTRScoringModel createNeuralNetworkModel(String name, List<Feature> features,
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
index 0e829e6..fb28ff8 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.Utils;
import org.apache.solr.ltr.TestRerankBase;
import org.apache.solr.ltr.feature.Feature;
@@ -39,6 +40,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+@LuceneTestCase.Nightly
public class TestModelManagerPersistence extends TestRerankBase {
@Before
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 7fb6976..d0cd65c 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1826,7 +1826,7 @@ public class CoreContainer implements Closeable {
core.unloadOnClose(cd, deleteIndexDir, deleteDataDir, deleteInstanceDir);
if (close) {
- core.close();
+ core.closeAndWait();
}
}
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 594ea6d..8283d38 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2095,9 +2095,9 @@ public final class SolrCore implements SolrInfoBean, Closeable {
}
synchronized (searcherLock) {
- if (isClosed() || (getCoreContainer() != null && getCoreContainer().isShutDown())) { // if we start new searchers after close we won't close them
- throw new SolrCoreState.CoreIsClosedException();
- }
+// if (isClosed() || (getCoreContainer() != null && getCoreContainer().isShutDown())) { // if we start new searchers after close we won't close them
+// throw new SolrCoreState.CoreIsClosedException();
+// }
newestSearcher = realtimeSearcher;
if (newestSearcher != null) {
@@ -2266,15 +2266,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
// it may take some time to open an index.... we may need to make
// sure that two threads aren't trying to open one at the same time
// if it isn't necessary.
- if (isClosed || coreContainer.isShutDown()) {
- throw new AlreadyClosedException();
- }
synchronized (searcherLock) {
-
- if (isClosed()) { // if we start new searchers after close we won't close them
- throw new SolrCoreState.CoreIsClosedException();
- }
-
for (;;) { // this loop is so w can retry in the event that we exceed maxWarmingSearchers
// see if we can return the current searcher
if (_searcher != null && !forceNew) {
@@ -2320,6 +2312,11 @@ public final class SolrCore implements SolrInfoBean, Closeable {
}
// At this point, we know we need to open a new searcher...
+
+ if (isClosed()) { // if we start new searchers after close we won't close them
+ throw new SolrCoreState.CoreIsClosedException();
+ }
+
// first: increment count to signal other threads that we are
// opening a new searcher.
onDeckSearchers.incrementAndGet();
diff --git a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
index 8811e45..0cd6df4 100644
--- a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
+++ b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java
@@ -19,6 +19,7 @@ package org.apache.solr;
import java.util.Arrays;
import java.util.List;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrQuery;
@@ -31,6 +32,7 @@ import org.junit.Test;
@Slow
@SuppressSSL(bugUrl="https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
// See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows machines occasionally
+@LuceneTestCase.Nightly // can be a slow test
public class DistributedIntervalFacetingTest extends
BaseDistributedSearchTestCase {
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
index d25b67c..d661471 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
@@ -19,6 +19,7 @@ package org.apache.solr;
import java.io.IOException;
import java.util.List;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
@@ -44,6 +45,7 @@ import static org.hamcrest.CoreMatchers.containsString;
*/
@Slow
@SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-10844")
+@LuceneTestCase.Nightly // this test can be slow in parallel tests - measure beforeClass - test - afterClass, not just test
public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
public TestDistributedGrouping() {
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
index 2be3543..42e9e89 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.junit.Test;
@@ -24,6 +25,7 @@ import org.junit.Test;
* Tests sortMissingFirst and sortMissingLast in distributed sort
*/
@Slow
+@LuceneTestCase.Nightly // can be a slow test - measure full test time, beforeClass + test + afterClass
public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
public TestDistributedMissingSort() {
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
index b27165c..7c9f45b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
@@ -76,7 +76,7 @@ public class RecoveryZkTest extends SolrCloudTestCase {
// start a couple indexing threads
- int[] maxDocList = new int[] {300, 700, 1200, 1350, 3000};
+ int[] maxDocList = new int[] {25, 55};
int[] maxDocNightlyList = new int[] {3000, 7000, 12000, 30000, 45000, 60000};
int maxDoc;
@@ -98,7 +98,12 @@ public class RecoveryZkTest extends SolrCloudTestCase {
indexThread2.start();
// give some time to index...
- int[] waitTimes = new int[] {200, 2000, 3000};
+ int[] waitTimes;
+ if (TEST_NIGHTLY) {
+ waitTimes = new int[]{1000, 2000, 5000};
+ } else {
+ waitTimes = new int[]{250, 350, 500};
+ }
Thread.sleep(waitTimes[random().nextInt(waitTimes.length - 1)]);
// bring shard replica down
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java
index 3f8c68e..33660f9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
@@ -50,6 +51,7 @@ import org.junit.BeforeClass;
* @see TestPseudoReturnFields
* @see TestRandomFlRTGCloud
*/
+@LuceneTestCase.Nightly // this test can be slow in parallel tests - measure beforeClass - test - afterClass, not just test
public class TestCloudPseudoReturnFields extends SolrCloudTestCase {
private static final String DEBUG_LABEL = MethodHandles.lookup().lookupClass().getName();
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
index d230a1d..80748d0 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import junit.framework.AssertionFailedError;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.response.FieldStatsInfo;
import org.apache.solr.client.solrj.response.PivotField;
@@ -35,6 +36,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.junit.Test;
+@LuceneTestCase.Nightly // can be a slow test - measure full test time, beforeClass + test + afterClass
public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCase {
public DistributedFacetPivotSmallTest() {
@@ -49,7 +51,7 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
// NOTE: we use the literal (4 character) string "null" as a company name
// to help ensure there isn't any bugs where the literal string is treated as if it
// were a true NULL value.
- index(id, 19, "place_t", "cardiff dublin", "company_t", "microsoft polecat", "price_ti", "15");
+ index(id, 19, "place_t", "cardiff dublin", "company_t", "microsoft polecat", "price_ti", "1TestDistributedMissingSort5");
index(id, 20, "place_t", "dublin", "company_t", "polecat microsoft null", "price_ti", "19",
// this is the only doc to have solo_* fields, therefore only 1 shard has them
// TODO: add enum field - blocked by SOLR-6682
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
index 95b7304..9d8a302 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
@@ -45,6 +45,12 @@ import org.junit.Test;
*/
public class DistributedTermsComponentTest extends BaseDistributedSearchTestCase {
+ public DistributedTermsComponentTest() {
+ if (!TEST_NIGHTLY) {
+ fixShardCount(2);
+ }
+ }
+
@Test
public void test() throws Exception {
Random random = random();
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
index 6374f86..11047f2 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.component;
import java.io.File;
import java.util.*;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks;
import org.apache.solr.SolrTestCaseJ4;
@@ -42,6 +43,7 @@ import org.junit.Test;
*/
@Slow
@SuppressTempFileChecks(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
+@LuceneTestCase.Nightly // this test can be slow in parallel tests - measure beforeClass - test - afterClass, not just test
public class SpellCheckComponentTest extends SolrTestCaseJ4 {
static String rh = "/spellCheckCompRH";
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
index 0f839a8..1e01605 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
@@ -45,6 +46,7 @@ import org.slf4j.LoggerFactory;
@Slow
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-9062")
@LogLevel("org.eclipse.jetty.client.HttpConnection=DEBUG")
+@LuceneTestCase.Nightly // this test can take a long time, perhaps due to schema, or maybe numeric fields?
public class TestDistributedStatsComponentCardinality extends BaseDistributedSearchTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -71,7 +73,7 @@ public class TestDistributedStatsComponentCardinality extends BaseDistributedSea
fixShardCount(TEST_NIGHTLY ? 7 : random().nextInt(3) + 1);
handle.put("maxScore", SKIPVAL);
- NUM_DOCS = TestUtil.nextInt(random(), TEST_NIGHTLY ? 10000 : 1000, TEST_NIGHTLY ? 15000 : 1500);
+ NUM_DOCS = TestUtil.nextInt(random(), TEST_NIGHTLY ? 10000 : 300, TEST_NIGHTLY ? 15000 : 450);
MAX_LONG = TestUtil.nextLong(random(), 0, NUM_DOCS * BIG_PRIME);
MIN_LONG = MAX_LONG - (((long)NUM_DOCS-1) * BIG_PRIME);
}
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
index 811a59a..f523e0d 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
@@ -33,6 +33,7 @@ import org.apache.lucene.search.similarities.BM25Similarity;
import org.apache.lucene.search.similarities.DFISimilarity;
import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;
import org.apache.lucene.search.similarities.Similarity;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.request.schema.SchemaRequest;
import org.apache.solr.common.SolrDocumentList;
@@ -53,6 +54,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.common.util.Utils.fromJSONString;
+@LuceneTestCase.Nightly // expensive test, uses 100
public class TestBulkSchemaAPI extends RestTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java b/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
index 933c840..5f552b7 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
import java.util.List;
import com.carrotsearch.randomizedtesting.annotations.Repeat;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrException;
@@ -31,6 +32,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
/** Test Heatmap Facets (both impls) */
+@LuceneTestCase.Nightly // nocommit - debug why this can be so slow - close to 30 seconds in a parallel run
public class SpatialHeatmapFacetsTest extends BaseDistributedSearchTestCase {
private static final String FIELD = "srpt_quad";
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java
index 3c0448e..6e9fb85 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.search.stats;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -24,6 +25,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.junit.Test;
// See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows machines occasionally
+@LuceneTestCase.Nightly // this test can be slow in parallel tests - measure beforeClass - test - afterClass, not just test
public class TestDefaultStatsCache extends BaseDistributedSearchTestCase {
private int docId = 0;
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java
index 7e3f096..8fef615 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java
@@ -16,6 +16,9 @@
*/
package org.apache.solr.search.stats;
+import org.apache.lucene.util.LuceneTestCase;
+
+@LuceneTestCase.Nightly // this test can be slow in parallel tests - measure beforeClass - test - afterClass, not just test
public class TestExactSharedStatsCache extends TestBaseStatsCache {
@Override
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 58cabb3..68ad3b5 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -48,6 +48,7 @@ import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
import org.apache.solr.client.solrj.cloud.autoscaling.AutoScalingConfig;
+import org.apache.solr.common.AlreadyClosedException;
import org.apache.solr.common.Callable;
import org.apache.solr.common.ParWork;
import org.apache.solr.common.SolrCloseable;
@@ -1559,11 +1560,11 @@ public class ZkStateReader implements SolrCloseable {
public static DocCollection getCollectionLive(ZkStateReader zkStateReader, String coll) {
try {
return zkStateReader.fetchCollectionState(coll, null);
+ } catch (KeeperException.SessionExpiredException | InterruptedException e) {
+ ParWork.propegateInterrupt(e);
+ throw new AlreadyClosedException("Could not load collection from ZK: " + coll, e);
} catch (KeeperException e) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Could not load collection from ZK: " + coll, e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new SolrException(ErrorCode.BAD_REQUEST, "Could not load collection from ZK: " + coll, e);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index ee3d207..fa158b7 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -136,7 +136,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
s[i] = solr[i].getUrl();
}
try (LBHttpSolrClient client = getLBHttpSolrClient(httpClient, s)) {
- client.setAliveCheckInterval(250);
+ client.setAliveCheckInterval(50);
SolrQuery solrQuery = new SolrQuery("*:*");
Set<String> names = new HashSet<>();
QueryResponse resp = null;
@@ -158,13 +158,13 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
solr[1].startJetty();
// Wait for the alive check to complete
- TimeOut timeout = new TimeOut(5, TimeUnit.SECONDS, TimeSource.NANO_TIME);
+ TimeOut timeout = new TimeOut(2, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (!timeout.hasTimedOut()) {
getNamesSize(s, client, solrQuery, names);
if (names.size() == 3) {
break;
}
- Thread.sleep(50);
+ Thread.sleep(10);
}
getNamesSize(s, client, solrQuery, names);
assertEquals(3, names.size());
@@ -183,7 +183,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
public void testTwoServers() throws Exception {
try (LBHttpSolrClient client = getLBHttpSolrClient(httpClient, solr[0].getUrl(), solr[1].getUrl())) {
- client.setAliveCheckInterval(250);
+ client.setAliveCheckInterval(50);
SolrQuery solrQuery = new SolrQuery("*:*");
QueryResponse resp = null;
solr[0].jetty.stop();
@@ -197,13 +197,9 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
solr[1].jetty.stop();
solr[1].jetty = null;
solr[0].startJetty();
- try {
- resp = client.query(solrQuery);
- } catch (SolrServerException e) {
- // try again after a pause in case the error is lack of time to start server
- Thread.sleep(50);
- resp = client.query(solrQuery);
- }
+
+ resp = client.query(solrQuery);
+
name = resp.getResults().get(0).getFieldValue("name").toString();
Assert.assertEquals("solr/collection10", name);
}
@@ -217,8 +213,8 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
CloseableHttpClient myHttpClient = HttpClientUtil.createClient(null);
try {
- try (LBHttpSolrClient client = getLBHttpSolrClient(myHttpClient, 500, 500, s)) {
- client.setAliveCheckInterval(250);
+ try (LBHttpSolrClient client = getLBHttpSolrClient(myHttpClient, 1000, 1500, s)) {
+ client.setAliveCheckInterval(50);
// Kill a server and test again
solr[1].jetty.stop();
diff --git a/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java
index d7a6ab5..9acd008 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java
@@ -52,7 +52,7 @@ public class RestTestHarness extends BaseTestHarness implements Closeable {
params.set(HttpClientUtil.PROP_SO_TIMEOUT, 10000);
httpClient = HttpClientUtil.createClient(params);
this.serverProvider = serverProvider;
- ObjectReleaseTracker.track(this);
+ assert ObjectReleaseTracker.track(this);
}
public String getBaseURL() {
@@ -238,6 +238,6 @@ public class RestTestHarness extends BaseTestHarness implements Closeable {
@Override
public void close() throws IOException {
HttpClientUtil.close(httpClient);
- ObjectReleaseTracker.release(this);
+ assert ObjectReleaseTracker.release(this);
}
}