You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/03/05 08:58:04 UTC
lucene-solr:branch_7x: SOLR-11066: Fix
TriggerIntegrationTest.testScheduledTrigger by ensuring number of jetties is
always 2 before start of test
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x b07382c6e -> f711d475b
SOLR-11066: Fix TriggerIntegrationTest.testScheduledTrigger by ensuring number of jetties is always 2 before start of test
(cherry picked from commit 3344306)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f711d475
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f711d475
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f711d475
Branch: refs/heads/branch_7x
Commit: f711d475ba206f430c91edce1cfcb6c8c282e26d
Parents: b07382c
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Mar 5 14:27:10 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Mar 5 14:27:45 2018 +0530
----------------------------------------------------------------------
.../cloud/autoscaling/TriggerIntegrationTest.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f711d475/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 348f1ce..e7f336f 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
@@ -78,7 +78,7 @@ import static org.apache.solr.common.cloud.ZkStateReader.SOLR_AUTOSCALING_CONF_P
/**
* An end-to-end integration test for triggers
*/
-@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG")
+@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG;org.apache.solr.client.solrj.cloud.autoscaling=DEBUG")
public class TriggerIntegrationTest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -125,6 +125,20 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
@Before
public void setupTest() throws Exception {
+ // ensure that exactly 2 jetty nodes are running
+ int numJetties = cluster.getJettySolrRunners().size();
+ log.info("Found {} jetty instances running", numJetties);
+ for (int i = 2; i < numJetties; i++) {
+ int r = random().nextInt(cluster.getJettySolrRunners().size());
+ log.info("Shutdown extra jetty instance at port {}", cluster.getJettySolrRunner(r).getLocalPort());
+ cluster.stopJettySolrRunner(r);
+ }
+ for (int i = cluster.getJettySolrRunners().size(); i < 2; i++) {
+ // start jetty instances
+ cluster.startJettySolrRunner();
+ }
+ cluster.waitForAllNodes(5);
+
NamedList<Object> overSeerStatus = cluster.getSolrClient().request(CollectionAdminRequest.getOverseerStatus());
String overseerLeader = (String) overSeerStatus.get("leader");
int overseerLeaderIndex = 0;
@@ -1636,7 +1650,6 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
assertEquals(5, docCollection.getReplicas().size());
}
- @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11066")
public void testScheduledTrigger() throws Exception {
CloudSolrClient solrClient = cluster.getSolrClient();