You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/02/21 16:36:43 UTC
lucene-solr:master: SOLR-11912: Clean up left-over collections and
defaults between tests.
Repository: lucene-solr
Updated Branches:
refs/heads/master a9f027238 -> 82a998407
SOLR-11912: Clean up left-over collections and defaults between tests.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/82a99840
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/82a99840
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/82a99840
Branch: refs/heads/master
Commit: 82a99840718bb7e696ef4af114eee976c776a251
Parents: a9f0272
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Feb 21 16:18:08 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Feb 21 17:36:38 2018 +0100
----------------------------------------------------------------------
.../org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a99840/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
index 1aaeaf3..2540606 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
@@ -142,6 +142,9 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
Stat stat = zkClient().setData(SOLR_AUTOSCALING_CONF_PATH, Utils.toJSON(new ZkNodeProps()), true);
log.info(SOLR_AUTOSCALING_CONF_PATH + " reset, new znode version {}", stat.getVersion());
+ cluster.deleteAllCollections();
+ cluster.getSolrClient().setDefaultCollection(null);
+
// restart Overseer. Even though we reset the autoscaling config some already running
// trigger threads may still continue to execute and produce spurious events
cluster.stopJettySolrRunner(overseerLeaderIndex);