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/09/02 04:13:40 UTC
[lucene-solr] 05/05: @694 Return some ignored tests to core.
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 c2d16f453bd501639859a8a779d76e052e77ac7c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 1 22:41:41 2020 -0500
@694 Return some ignored tests to core.
---
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 2 +-
.../src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java | 1 -
.../src/test/org/apache/solr/TestHighlightDedupGrouping.java | 1 -
.../api/collections/AsyncCallRequestStatusResponseTest.java | 2 +-
.../apache/solr/cloud/api/collections/TestCollectionAPI.java | 11 ++++++++---
.../apache/solr/client/solrj/impl/BaseCloudSolrClient.java | 1 +
.../java/org/apache/solr/client/solrj/impl/LBSolrClient.java | 3 +++
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 79a8c94..f2de9cc 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -1146,7 +1146,7 @@ public class HttpSolrCall {
if (!activeReplicas || (liveNodes.contains(replica.getNodeName())
&& replica.getState() == Replica.State.ACTIVE)) {
- if (byCoreName && !origCorename.equals(replica.getStr(CORE_NAME_PROP))) {
+ if (byCoreName && (origCorename == null || !origCorename.equals(replica.getStr(CORE_NAME_PROP)))) {
// if it's by core name, make sure they match
continue;
}
diff --git a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
index 92f0f67..6263ba2 100644
--- a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
+++ b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
@@ -32,7 +32,6 @@ import org.junit.Ignore;
import java.io.File;
import java.io.IOException;
-@Ignore
public class AnalysisAfterCoreReloadTest extends SolrTestCaseJ4 {
private static String tmpSolrHome;
diff --git a/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java b/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java
index 12a015c..9ceb62b 100644
--- a/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java
+++ b/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java
@@ -31,7 +31,6 @@ import org.junit.Test;
* Tests that highlighting doesn't break on grouped documents
* with duplicate unique key fields stored on multiple shards.
*/
-@Ignore // nocommit
public class TestHighlightDedupGrouping extends BaseDistributedSearchTestCase {
private static final String id_s1 = "id_s1"; // string copy of the id for highlighting
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/AsyncCallRequestStatusResponseTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/AsyncCallRequestStatusResponseTest.java
index 090d6a7..d994af8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/AsyncCallRequestStatusResponseTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/AsyncCallRequestStatusResponseTest.java
@@ -50,7 +50,7 @@ public class AsyncCallRequestStatusResponseTest extends SolrCloudTestCase {
@SuppressWarnings("deprecation")
@Test
- @Ignore // nocommit - still working on async
+ @Ignore // nocommit - this is flakey in it's wait for the async call to complete, or the system is flakey in reporting
public void testAsyncCallStatusResponse() throws Exception {
int numShards = 4;
int numReplicas = 1;
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
index 3aecb92..0f67d1a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
@@ -25,12 +25,15 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import com.google.common.collect.Lists;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;
import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.V2Request;
@@ -53,7 +56,7 @@ import org.apache.zookeeper.KeeperException;
import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit debug - replication is failing to delete local index
+@LuceneTestCase.Nightly
public class TestCollectionAPI extends ReplicaPropertiesBase {
public static final String COLLECTION_NAME = "testcollection";
@@ -61,6 +64,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
public TestCollectionAPI() throws Exception {
useFactory(null);
+ System.setProperty("solr.suppressDefaultConfigBootstrap", "false");
schemaString = "schema15.xml"; // we need a string id
sliceCount = 2;
System.setProperty("solr.default.collection_op_timeout", "20000");
@@ -71,6 +75,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
@ShardsFixed(num = 2)
public void test() throws Exception {
try (CloudHttp2SolrClient client = createCloudClient(null)) {
+
CollectionAdminRequest.Create req;
if (useTlogReplicas()) {
req = CollectionAdminRequest.createCollection(COLLECTION_NAME, "_default",2, 0, 1, 1);
@@ -97,8 +102,8 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
// nocommit debug
// replicaPropTest();
- clusterStatusZNodeVersion();
- testClusterStateMigration();
+ // clusterStatusZNodeVersion(); maybe this relies on stateformat=1?
+ // testClusterStateMigration(); same
testCollectionCreationCollectionNameValidation();
testCollectionCreationTooManyShards();
testReplicationFactorValidaton();
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java
index 7dd39c8..0ddd0b4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java
@@ -899,6 +899,7 @@ public abstract class BaseCloudSolrClient extends SolrClient {
DocCollection coll = getDocCollection(requestedCollection, null);
if (coll == null) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Collection not found: " + requestedCollection);
+ // TODO if we are creating it, we wouldn't find it?
}
int collVer = coll.getZNodeVersion();
if (coll.getStateFormat()>1) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
index 9d31057..1735438 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
@@ -313,6 +313,9 @@ public abstract class LBSolrClient extends SolrClient {
// try the servers we previously skipped
if (skipped != null) {
for (ServerWrapper wrapper : skipped) {
+ if (wrapper == null) {
+ continue;
+ }
if (timeAllowedExceeded = isTimeExceeded(timeAllowedNano, timeOutTime)) {
break;
}