You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by GitBox <gi...@apache.org> on 2021/09/06 13:49:42 UTC
[GitHub] [solr] mariemat opened a new pull request #286: SOLR-14892 - shards.info with shards.tolerant can yield an empty key
mariemat opened a new pull request #286:
URL: https://github.com/apache/solr/pull/286
https://issues.apache.org/jira/browse/SOLR-14892
# Solution
This PR ensures that the shard name is not empty, and that it is unique, however this is not the real shard name but a string in the form of `unknown_shard_xxx`
A better fix would be to provide the real name of the shard as the key, however that information is long gone when we reach the creation of `shards.info` content.
# Tests
I added a test to disable 2 shards and ensures that there are still 3 keys returned
# Checklist
Please review the following and check all that apply:
- [X] I have reviewed the guidelines for [How to Contribute](https://wiki.apache.org/solr/HowToContribute) and my code conforms to the standards described there to the best of my ability.
- [X] I have created a Jira issue and added the issue ID to my pull request title.
- [X] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended)
- [X] I have developed this patch against the `main` branch.
- [X] I have run `./gradlew check`.
- [X] I have added tests for my changes.
- [ ] I have added documentation for the [Reference Guide](https://github.com/apache/solr/tree/main/solr/solr-ref-guide)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] anshumg commented on a change in pull request #286: SOLR-14892 - shards.info with shards.tolerant can yield an empty key
Posted by GitBox <gi...@apache.org>.
anshumg commented on a change in pull request #286:
URL: https://github.com/apache/solr/pull/286#discussion_r724472266
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ configureCluster(3)
+ .addConfig("cloud-minimal", configset("cloud-minimal"))
+ .configure();
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void searchingWithShardsInfoMustNotReturneEmptyOrDuplicateKeys() throws Exception {
+
+ CollectionAdminRequest.createCollection("collection", "cloud-minimal", 3, 1)
+ .process(cluster.getSolrClient());
+
+ UpdateRequest update = new UpdateRequest();
+ for (int i = 0; i < 100; i++) {
+ update.add("id", Integer.toString(i));
+ }
+ update.commit(cluster.getSolrClient(), "collection");
+
+ // Stops 2 shards
+ for (int i = 0; i < 2; i++) {
+ cluster.waitForJettyToStop(cluster.stopJettySolrRunner(i));
+ }
+
+ QueryResponse response = cluster.getSolrClient().query("collection", new SolrQuery("*:*")
+ .setRows(1)
+ .setParam(ShardParams.SHARDS_TOLERANT, true)
+ .setParam(ShardParams.SHARDS_INFO, true));
+ assertThat(response.getStatus(), is(0));
+ assertTrue(response.getResults().getNumFound() > 0);
+
+ SimpleOrderedMap<Object> shardsInfo = (SimpleOrderedMap<Object>) response.getResponse().get("shards.info");
+ // We verify that there are no duplicate keys in case of 2 shards in error
+ assertEquals(3, shardsInfo.size());
+
+ Collection<String> keys = new ArrayList<>();
+ keys.add(shardsInfo.getName(0));
+ keys.add(shardsInfo.getName(1));
+ keys.add(shardsInfo.getName(2));
+
+ assertThat((Iterable<String>) keys, hasItems("unknown_shard_1", "unknown_shard_2"));
Review comment:
Let's replace the `assertThat` usage here as well
##########
File path: solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
##########
@@ -527,9 +525,7 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
}
}
nl.add("error", cause.toString() );
- StringWriter trace = new StringWriter();
- cause.printStackTrace(new PrintWriter(trace));
Review comment:
We might want to continue logging this exception
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ configureCluster(3)
+ .addConfig("cloud-minimal", configset("cloud-minimal"))
+ .configure();
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void searchingWithShardsInfoMustNotReturneEmptyOrDuplicateKeys() throws Exception {
+
+ CollectionAdminRequest.createCollection("collection", "cloud-minimal", 3, 1)
+ .process(cluster.getSolrClient());
+
+ UpdateRequest update = new UpdateRequest();
+ for (int i = 0; i < 100; i++) {
+ update.add("id", Integer.toString(i));
+ }
+ update.commit(cluster.getSolrClient(), "collection");
+
+ // Stops 2 shards
+ for (int i = 0; i < 2; i++) {
+ cluster.waitForJettyToStop(cluster.stopJettySolrRunner(i));
+ }
+
+ QueryResponse response = cluster.getSolrClient().query("collection", new SolrQuery("*:*")
+ .setRows(1)
+ .setParam(ShardParams.SHARDS_TOLERANT, true)
+ .setParam(ShardParams.SHARDS_INFO, true));
+ assertThat(response.getStatus(), is(0));
Review comment:
`assertThat` is deprecated and it'd be good to replace this with `assertEquals` here
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
Review comment:
Can we change the name to something more generic and have only the method highlight the specifics? Something like `TestShardsInfoResponse` ?
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ configureCluster(3)
+ .addConfig("cloud-minimal", configset("cloud-minimal"))
+ .configure();
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void searchingWithShardsInfoMustNotReturneEmptyOrDuplicateKeys() throws Exception {
Review comment:
Typo - extra `e` after `Return`
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
Review comment:
This is never used.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] anshumg commented on a change in pull request #286: SOLR-14892 - shards.info with shards.tolerant can yield an empty key
Posted by GitBox <gi...@apache.org>.
anshumg commented on a change in pull request #286:
URL: https://github.com/apache/solr/pull/286#discussion_r724472266
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ configureCluster(3)
+ .addConfig("cloud-minimal", configset("cloud-minimal"))
+ .configure();
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void searchingWithShardsInfoMustNotReturneEmptyOrDuplicateKeys() throws Exception {
+
+ CollectionAdminRequest.createCollection("collection", "cloud-minimal", 3, 1)
+ .process(cluster.getSolrClient());
+
+ UpdateRequest update = new UpdateRequest();
+ for (int i = 0; i < 100; i++) {
+ update.add("id", Integer.toString(i));
+ }
+ update.commit(cluster.getSolrClient(), "collection");
+
+ // Stops 2 shards
+ for (int i = 0; i < 2; i++) {
+ cluster.waitForJettyToStop(cluster.stopJettySolrRunner(i));
+ }
+
+ QueryResponse response = cluster.getSolrClient().query("collection", new SolrQuery("*:*")
+ .setRows(1)
+ .setParam(ShardParams.SHARDS_TOLERANT, true)
+ .setParam(ShardParams.SHARDS_INFO, true));
+ assertThat(response.getStatus(), is(0));
+ assertTrue(response.getResults().getNumFound() > 0);
+
+ SimpleOrderedMap<Object> shardsInfo = (SimpleOrderedMap<Object>) response.getResponse().get("shards.info");
+ // We verify that there are no duplicate keys in case of 2 shards in error
+ assertEquals(3, shardsInfo.size());
+
+ Collection<String> keys = new ArrayList<>();
+ keys.add(shardsInfo.getName(0));
+ keys.add(shardsInfo.getName(1));
+ keys.add(shardsInfo.getName(2));
+
+ assertThat((Iterable<String>) keys, hasItems("unknown_shard_1", "unknown_shard_2"));
Review comment:
Let's replace the `assertThat` usage here as well
##########
File path: solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
##########
@@ -527,9 +525,7 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
}
}
nl.add("error", cause.toString() );
- StringWriter trace = new StringWriter();
- cause.printStackTrace(new PrintWriter(trace));
Review comment:
We might want to continue logging this exception
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ configureCluster(3)
+ .addConfig("cloud-minimal", configset("cloud-minimal"))
+ .configure();
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void searchingWithShardsInfoMustNotReturneEmptyOrDuplicateKeys() throws Exception {
+
+ CollectionAdminRequest.createCollection("collection", "cloud-minimal", 3, 1)
+ .process(cluster.getSolrClient());
+
+ UpdateRequest update = new UpdateRequest();
+ for (int i = 0; i < 100; i++) {
+ update.add("id", Integer.toString(i));
+ }
+ update.commit(cluster.getSolrClient(), "collection");
+
+ // Stops 2 shards
+ for (int i = 0; i < 2; i++) {
+ cluster.waitForJettyToStop(cluster.stopJettySolrRunner(i));
+ }
+
+ QueryResponse response = cluster.getSolrClient().query("collection", new SolrQuery("*:*")
+ .setRows(1)
+ .setParam(ShardParams.SHARDS_TOLERANT, true)
+ .setParam(ShardParams.SHARDS_INFO, true));
+ assertThat(response.getStatus(), is(0));
Review comment:
`assertThat` is deprecated and it'd be good to replace this with `assertEquals` here
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
Review comment:
Can we change the name to something more generic and have only the method highlight the specifics? Something like `TestShardsInfoResponse` ?
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ configureCluster(3)
+ .addConfig("cloud-minimal", configset("cloud-minimal"))
+ .configure();
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void searchingWithShardsInfoMustNotReturneEmptyOrDuplicateKeys() throws Exception {
Review comment:
Typo - extra `e` after `Return`
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestNoDuplicateKeysInShardsInfoWhenShardsDown.java
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.ShardParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
+
+/**
+ * Test which asserts that shards.info=true works even if several shards are down
+ * It must return one unique key per shard.
+ * See SOLR-14892
+ */
+public class TestNoDuplicateKeysInShardsInfoWhenShardsDown extends SolrCloudTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
Review comment:
This is never used.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org