lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [lucene-solr] branch master updated: Fix an occasional test error caused by the maintenance trigger generating events.
Date Mon, 16 Dec 2019 12:54:44 GMT
This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 83800c0  Fix an occasional test error caused by the maintenance trigger generating
events.
83800c0 is described below

commit 83800c03dfe7809c3621b38dc54c7953714c7eaa
Author: Andrzej Bialecki <ab@apache.org>
AuthorDate: Mon Dec 16 13:53:22 2019 +0100

    Fix an occasional test error caused by the maintenance trigger generating events.
---
 .../apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
index a50a377..adc41cc 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
@@ -45,6 +45,7 @@ import org.apache.solr.client.solrj.cloud.autoscaling.Suggester;
 import org.apache.solr.client.solrj.cloud.autoscaling.Suggestion;
 import org.apache.solr.client.solrj.cloud.autoscaling.VersionedData;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.cloud.CloudTestUtils;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.cloud.ClusterState;
 import org.apache.solr.common.cloud.Replica;
@@ -81,6 +82,9 @@ public class TestSnapshotCloudManager extends SolrCloudTestCase {
         .process(cluster.getSolrClient());
     realManager = cluster.getJettySolrRunner(cluster.getJettySolrRunners().size() - 1).getCoreContainer()
         .getZkController().getSolrCloudManager();
+    // disable .scheduled_maintenance (once it exists)
+    CloudTestUtils.waitForTriggerToBeScheduled(realManager, ".scheduled_maintenance");
+    CloudTestUtils.suspendTrigger(realManager, ".scheduled_maintenance");
   }
 
   @AfterClass


Mime
View raw message