Apache Solr open-source search software
SOLR-16416: Fix testDesignatedOverseerRestarts
Houston Putmanb01ae1783946
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.javaindex 0ba30acfff3..21211623e18 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java@@ -187,8 +187,13 @@ public class OverseerRolesTest extends SolrCloudTestCase {}logOverseerState();// Remove the OVERSEER role, in case it was already assigned by another test in this suite- for (String node :- OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient())) {+ List<String> nodes =+ OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient());+ // We want to remove from the last (in election order) to the first.+ // This way the current overseer will have its role removed last,+ // so there will not be any elections.+ Collections.reverse(nodes);+ for (String node : nodes) {CollectionAdminRequest.removeRole(node, "overseer").process(cluster.getSolrClient());}String overseer1 = OverseerCollectionConfigSetProcessor.getLeaderNode(zkClient());@@ -203,10 +208,6 @@ public class OverseerRolesTest extends SolrCloudTestCase {waitForNewOverseer(15, overseer1, false);JettySolrRunner leaderJetty = getOverseerJetty();- List<String> nodes =- OverseerCollectionConfigSetProcessor.getSortedOverseerNodeNames(zkClient());- nodes.remove(overseer1); // remove the designated overseer-logOverseerState();// kill the current overseer, and check that the next node in the election queue assumes// leadership