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:48 UTC
[lucene-solr] 01/02: @964 Do not remove /collections zk node early.
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";