From 96e0c2ff48cf70f9c376760e50b78281699d0e53 Mon Sep 17 00:00:00 2001 From: Mikhail Khludnev Date: Fri, 14 Oct 2016 13:53:02 +0300 Subject: [PATCH] SOLR-9639: CDCR Tests only fix. Wait until recovery is over before remove the tmp_colletion. --- solr/CHANGES.txt | 2 ++ .../test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java | 1 + 2 files changed, 3 insertions(+) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index c7c13701496..26835351693 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -234,6 +234,8 @@ Other Changes * SOLR-9610: New AssertTool in SolrCLI for easier cross platform assertions from command line (janhoy) +* SOLR-9639: Test only fix. Prevent CDCR tests from removing collection during recovery that used to blow up jvm (Mikhail Khludnev) + ================== 6.2.1 ================== Bug Fixes diff --git a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java index 0d6fd169bf9..ba183f85c97 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java @@ -591,6 +591,7 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase { } } + this.waitForRecoveriesToFinish(temporaryCollection,zkStateReader, true); // delete the temporary collection - we will create our own collections later this.deleteCollection(temporaryCollection); this.waitForCollectionToDisappear(temporaryCollection);