You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2016/10/15 23:55:27 UTC
[15/24] lucene-solr:jira/solr-8396: SOLR-9639: CDCR Tests only fix.
Wait until recovery is over before remove the tmp_colletion.
SOLR-9639: CDCR Tests only fix. Wait until recovery is over before
remove the tmp_colletion.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/47446733
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/47446733
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/47446733
Branch: refs/heads/jira/solr-8396
Commit: 47446733884e030feaecac355c01c58f9e5e3169
Parents: f4d3ca8
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Fri Oct 14 13:53:02 2016 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Fri Oct 14 14:43:07 2016 +0300
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47446733/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7124d40..3280778 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -271,6 +271,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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47446733/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
----------------------------------------------------------------------
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 3d758e0..35cc444 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
@@ -593,6 +593,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);