Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-01 05:49:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test to use solr.disable.shardsWhitelist=true rather then trying to whitelist the set of servers

Browse Source 
The previous version of this test had a chicken/egg problem (needed to init the servers w/the whitelist but didn't know the port nums until after init)

that caused it to require 'restarting' the servers -- leading to the possibility of 'Address already in use' errors from jenkins machines if the OS reclaimed the port between the stop/start of the jetty instance
This commit is contained in:
Chris Hostetter 2019-04-03 15:15:03 -07:00
parent 6596ed1c16
commit 3fe4d0a30a
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
View File

@ -58,6 +58,7 @@ public class TestJsonFacets extends SolrTestCaseHS {
@BeforeClass
public static void beforeTests() throws Exception {
systemSetPropertySolrDisableShardsWhitelist("true");
JSONTestUtil.failRepeatedKeys = true;
origTableSize = FacetFieldProcessorByHashDV.MAXIMUM_STARTING_TABLE_SIZE;
@ -74,35 +75,16 @@ public class TestJsonFacets extends SolrTestCaseHS {
}
/**
* Start all servers for cluster, initialize shards whitelist and then restart
* Start all servers for cluster if they don't already exist
*/
public static void initServers() throws Exception {
if (servers == null) {
servers = new SolrInstances(3, "solrconfig-tlog.xml", "schema_latest.xml");
// Set the shards whitelist to all shards plus the fake one used for tolerant test
System.setProperty(SOLR_TESTS_SHARDS_WHITELIST, servers.getWhitelistString() + ",http://[ff01::114]:33332");
systemSetPropertySolrDisableShardsWhitelist("false");
restartServers();
}
}
/**
* Restart all configured servers, i.e. configuration will be re-read
*/
public static void restartServers() {
servers.slist.forEach(s -> {
try {
s.stop();
s.start();
} catch (Exception e) {
fail("Exception during server restart: " + e.getMessage());
}
});
}
@AfterClass
public static void afterTests() throws Exception {
System.clearProperty(SOLR_TESTS_SHARDS_WHITELIST);
systemClearPropertySolrDisableShardsWhitelist();
JSONTestUtil.failRepeatedKeys = false;
FacetFieldProcessorByHashDV.MAXIMUM_STARTING_TABLE_SIZE=origTableSize;