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

SOLR-13410: Making the test more resilient

This commit is contained in:
Ishan Chattopadhyaya 2019-05-07 00:58:08 +05:30
parent ef3b6a1aa3
commit ca29340d8b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,8 @@ import org.apache.solr.common.util.TimeSource;
import org.apache.solr.common.util.Utils; import org.apache.solr.common.util.Utils;
import org.apache.solr.util.TimeOut; import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException;
import org.junit.BeforeClass; import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -44,13 +45,17 @@ public class OverseerRolesTest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass @Before
public static void setupCluster() throws Exception { public void setupCluster() throws Exception {
configureCluster(6) configureCluster(4)
.addConfig("conf", configset("cloud-minimal")) .addConfig("conf", configset("cloud-minimal"))
.configure(); .configure();
} }
@After
public void tearDownCluster() throws Exception {
shutdownCluster();
}
private void waitForNewOverseer(int seconds, Predicate<String> state, boolean failOnIntermediateTransition) throws Exception { private void waitForNewOverseer(int seconds, Predicate<String> state, boolean failOnIntermediateTransition) throws Exception {
TimeOut timeout = new TimeOut(seconds, TimeUnit.SECONDS, TimeSource.NANO_TIME); TimeOut timeout = new TimeOut(seconds, TimeUnit.SECONDS, TimeSource.NANO_TIME);
@ -173,20 +178,24 @@ public class OverseerRolesTest extends SolrCloudTestCase {
CollectionAdminRequest.removeRole(node, "overseer").process(cluster.getSolrClient()); CollectionAdminRequest.removeRole(node, "overseer").process(cluster.getSolrClient());
} }
String overseer1 = OverseerCollectionConfigSetProcessor.getLeaderNode(zkClient()); String overseer1 = OverseerCollectionConfigSetProcessor.getLeaderNode(zkClient());
int counter = 0;
while (overseer1 == null && counter < 10) {
overseer1 = OverseerCollectionConfigSetProcessor.getLeaderNode(zkClient());
Thread.sleep(1000);
}
// 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);
JettySolrRunner leaderJetty = getOverseerJetty();
List<String> nodes = OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient()); List<String> nodes = OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient());
nodes.remove(overseer1); // remove the designated overseer nodes.remove(overseer1); // remove the designated overseer
JettySolrRunner leaderJetty = getOverseerJetty();
logOverseerState(); logOverseerState();
// kill the current overseer, and check that the next node in the election queue assumes leadership // 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);
// after 5 seconds, bring back dead designated overseer and assert that it assumes leadership "right away", // after 5 seconds, bring back dead designated overseer and assert that it assumes leadership "right away",
// i.e. without any other node assuming leadership before this node becomes leader. // i.e. without any other node assuming leadership before this node becomes leader.
@ -197,3 +206,4 @@ public class OverseerRolesTest extends SolrCloudTestCase {
waitForNewOverseer(15, overseer1, true); // assert that there is just a single leadership transition waitForNewOverseer(15, overseer1, true); // assert that there is just a single leadership transition
} }
} }