Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-13410: Fix for test failure of the newly added test

This commit is contained in:
Ishan Chattopadhyaya 2019-05-04 20:32:20 +05:30
parent 400a918071
commit 3d9d72ba69
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
View File

@ -61,7 +61,7 @@ public class OverseerRolesTest extends SolrCloudTestCase {
if (state.test(current)) if (state.test(current))
return; return;
else if (failOnIntermediateTransition) { else if (failOnIntermediateTransition) {
if (prev != null && !current.equals(prev)) { if (prev != null && current != null && !current.equals(prev)) {
fail ("There was an intermediate transition, previous: "+prev+", intermediate transition: "+current); fail ("There was an intermediate transition, previous: "+prev+", intermediate transition: "+current);
} }
} }
@ -93,7 +93,7 @@ public class OverseerRolesTest extends SolrCloudTestCase {
private void logOverseerState() throws KeeperException, InterruptedException { private void logOverseerState() throws KeeperException, InterruptedException {
log.info("Overseer: {}", getLeaderNode(zkClient())); log.info("Overseer: {}", getLeaderNode(zkClient()));
log.info("Election queue: ", getSortedElectionNodes(zkClient(), "/overseer_elect/election")); log.info("Election queue: {}", getSortedElectionNodes(zkClient(), "/overseer_elect/election"));
} }
@Test @Test
@ -168,21 +168,22 @@ public class OverseerRolesTest extends SolrCloudTestCase {
@Test @Test
public void testDesignatedOverseerRestarts() throws Exception { public void testDesignatedOverseerRestarts() throws Exception {
logOverseerState(); logOverseerState();
List<String> nodes = OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient());
// Remove the OVERSEER role, in case it was already assigned by another test in this suite // Remove the OVERSEER role, in case it was already assigned by another test in this suite
for (String node: nodes) { for (String node: OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient())) {
CollectionAdminRequest.removeRole(node, "overseer").process(cluster.getSolrClient()); CollectionAdminRequest.removeRole(node, "overseer").process(cluster.getSolrClient());
} }
String overseer1 = OverseerCollectionConfigSetProcessor.getLeaderNode(zkClient()); String overseer1 = OverseerCollectionConfigSetProcessor.getLeaderNode(zkClient());
nodes.remove(overseer1);
// Setting overseer role to the current overseer // Setting overseer role to the current overseer
CollectionAdminRequest.addRole(overseer1, "overseer").process(cluster.getSolrClient()); CollectionAdminRequest.addRole(overseer1, "overseer").process(cluster.getSolrClient());
waitForNewOverseer(15, overseer1, false); waitForNewOverseer(15, overseer1, false);
// kill the current overseer, and check that the next node in the election queue assumes leadership List<String> nodes = OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient());
nodes.remove(overseer1); // remove the designated overseer
JettySolrRunner leaderJetty = getOverseerJetty(); JettySolrRunner leaderJetty = getOverseerJetty();
logOverseerState(); logOverseerState();
// kill the current overseer, and check that the next node in the election queue assumes leadership
leaderJetty.stop(); leaderJetty.stop();
log.info("Killing designated overseer: "+overseer1); log.info("Killing designated overseer: "+overseer1);
waitForNewOverseer(10, nodes.get(0), false); waitForNewOverseer(10, nodes.get(0), false);
@ -193,6 +194,6 @@ public class OverseerRolesTest extends SolrCloudTestCase {
logOverseerState(); logOverseerState();
log.info("Starting back the prioritized overseer.."); log.info("Starting back the prioritized overseer..");
leaderJetty.start(); leaderJetty.start();
waitForNewOverseer(1500000, overseer1, true); // assert that there is just a single leadership transition waitForNewOverseer(15, overseer1, true); // assert that there is just a single leadership transition
} }
} }