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/10/09 00:07:47 UTC
[lucene-solr] branch reference_impl_dev updated (6fcf7f7 -> 37ea22b)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 6fcf7f7 @963 Pull for the moment.
new a30fe7c @964 Do not remove /collections zk node early.
new 37ea22b @965 Enable this reload test.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java | 6 ------
.../cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java | 6 ++----
2 files changed, 2 insertions(+), 10 deletions(-)
[lucene-solr] 01/02: @964 Do not remove /collections zk node early.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit a30fe7c95e9f905b36faffd27eb6738922d51351
Author: markrmiller <ma...@gmail.com>
AuthorDate: Thu Oct 8 18:58:52 2020 -0500
@964 Do not remove /collections zk node early.
---
.../org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java | 6 ------
.../cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
index 8185b1c..221d0db 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
@@ -135,12 +135,6 @@ public class DeleteCollectionCmd implements OverseerCollectionMessageHandler.Cmd
if (!zkStateReader.getZkClient().exists(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection)) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Could not find collection");
}
- try {
-
- zkStateReader.getZkClient().clean(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection);
- } catch (Exception e) {
- log.error("Exception while trying to remove collection zknode", e);
- }
@SuppressWarnings({"unchecked"})
List<Replica> failedReplicas = ocmh.collectionCmd(internalMsg, params, results, null, asyncId, okayExceptions);
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
index 28aaf40..d880989 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.solr.cloud.api.collections;
-import com.google.common.collect.ImmutableList;
+import org.apache.curator.shaded.com.google.common.collect.ImmutableList;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
@@ -120,7 +120,6 @@ public class CollectionsAPIDistClusterPerZkTest extends SolrCloudTestCase {
}
@Test
- @Ignore // nocommit - this will cause zk shard terms to keep trying to save and fail on bad version and retry over and over ... investigate
public void deleteCollectionOnlyInZk() throws Exception {
final String collectionName = "onlyinzk";
[lucene-solr] 02/02: @965 Enable this reload test.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 37ea22b31fe32977589b5179073050dc59c911a9
Author: markrmiller <ma...@gmail.com>
AuthorDate: Thu Oct 8 19:00:47 2020 -0500
@965 Enable this reload test.
---
.../solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
index d880989..64d8e9a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
@@ -331,10 +331,9 @@ public class CollectionsAPIDistClusterPerZkTest extends SolrCloudTestCase {
}
@Test
- @Ignore // nocommit have to fix reload again, ug, its a pain, I don't recall the exact incantation
public void testCollectionReload() throws Exception {
final String collectionName = "reloaded_collection";
- CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2).process(cluster.getSolrClient());
+ CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2).setMaxShardsPerNode(10).process(cluster.getSolrClient());
// get core open times
Map<String, Long> urlToTimeBefore = new HashMap<>();