You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2020/09/02 19:11:18 UTC
[lucene-solr] branch reference_impl_dev updated: Un-ignore more
SolrJ tests, mostly related to ConcurrentUpdateHttp2SolrClient
This is an automated email from the ASF dual-hosted git repository.
thelabdude pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new ed62580 Un-ignore more SolrJ tests, mostly related to ConcurrentUpdateHttp2SolrClient
ed62580 is described below
commit ed62580b05cbebc89c600334d35fb5956ed26b65
Author: Timothy Potter <th...@gmail.com>
AuthorDate: Wed Sep 2 13:11:03 2020 -0600
Un-ignore more SolrJ tests, mostly related to ConcurrentUpdateHttp2SolrClient
---
.../solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java | 2 +-
.../test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java | 2 --
.../apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java | 2 --
.../org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java | 4 ++--
.../client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java | 2 --
.../solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java | 2 --
.../impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java | 2 +-
.../solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java | 4 ++--
8 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java
index 4385963..92c358f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java
@@ -154,7 +154,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {
this.runners = new LinkedList<>();
this.streamDeletes = builder.streamDeletes;
this.basePath = builder.baseSolrUrl;
- this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 0);
+ this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 101); // nocommit ~ TJP: this unblocks a bunch of ignored tests but is it correct?
if (stallTime < pollQueueTime * 2) {
throw new RuntimeException("Invalid stallTime: " + stallTime + "ms, must be 2x > pollQueueTime " + pollQueueTime);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
index 6272150..3a1fc89 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
@@ -39,7 +39,6 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.session.DefaultSessionIdManager;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
@@ -48,7 +47,6 @@ import org.junit.rules.TestRule;
*
* @since solr 1.3
*/
-@Ignore // nocommit debug
public class JettyWebappTest extends SolrTestCaseJ4
{
int port = 0;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
index f340119..85279d7 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.embedded;
import org.apache.solr.client.solrj.MergeIndexesExampleTestBase;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.core.SolrCore;
-import org.junit.Ignore;
/**
* Test for merge indexes command
@@ -27,7 +26,6 @@ import org.junit.Ignore;
* @since solr 1.4
*
*/
-@Ignore // nocommit flakey
public class MergeIndexesEmbeddedTest extends MergeIndexesExampleTestBase {
@Override
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
index c1893e9..0afc966 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
@@ -49,17 +49,17 @@ import java.util.stream.IntStream;
*
*/
@SolrTestCase.SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
-@Ignore // nocommit debug
public class SolrExampleJettyTest extends SolrExampleTests {
private static JettySolrRunner jetty;
@BeforeClass
- public static void beforeTest() throws Exception {
+ public static void beforeSolrExampleJettyTest() throws Exception {
jetty = createAndStartJetty(legacyExampleCollection1SolrHome());
}
@Test
+ @Ignore // nocommit ~ debug
public void testBadSetup() {
// setup the server...
String url = "http" + (isSSLMode() ? "s" : "") + "://127.0.0.1/?core=xxx";
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java
index 0f5a2ac..0aed863 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java
@@ -32,12 +32,10 @@ import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
-import org.junit.Ignore;
import org.junit.Test;
@LuceneTestCase.Slow
@SolrTestCaseJ4.SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
-@Ignore // nocommit debug
public class SolrExampleStreamingBinaryHttp2Test extends SolrExampleStreamingHttp2Test {
@Override
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
index f1729a6..0ba1f6f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
@@ -27,10 +27,8 @@ import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit debug
public class ConcurrentUpdateHttp2SolrClientBadInputTest extends SolrJettyTestBase {
private static final List<String> NULL_STR_LIST = null;
private static final List<String> EMPTY_STR_LIST = new ArrayList<>();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java
index 1600882..d72b108 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientMultiCollectionTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
* {@link ConcurrentUpdateSolrClient} reuses the same HTTP connection to send multiple requests. These tests ensure
* that this connection-reuse never results in documents being sent to the wrong collection. See SOLR-12803
*/
-@Ignore // nocommit debug
+//@Ignore // nocommit debug
public class ConcurrentUpdateHttp2SolrClientMultiCollectionTest extends SolrCloudTestCase {
private static final String COLLECTION_ONE_NAME = "collection1";
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
index 6d83d58..c7f950e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
@@ -34,10 +34,8 @@ import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit debug, TJP ~ still problematic
public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {
private static JettySolrRunner jetty;
@@ -52,6 +50,7 @@ public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {
}
@Test
+ @Nightly
public void testConcurrentUpdate() throws Exception {
ConcurrentUpdateSolrClientTest.TestServlet.clear();
@@ -143,6 +142,7 @@ public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {
}
@Test
+ @Nightly
public void testConcurrentCollectionUpdate() throws Exception {
int cussThreadCount = 2;