mirror of https://github.com/apache/lucene.git
SOLR-13534: Fix test
Remove buggy 'port roulette' code that can easily fail if OS gives the selected port to a different process just before creating the server Use jetty's built in support for listining on an OS selected port instead Also increase timeouts to better account for slow/heavily loaded (ie:jenkins) VMs where SolrCore reloading may take longer then 10 seconds
This commit is contained in:
parent
2d357c960c
commit
19c78ddf98
|
@ -20,7 +20,6 @@ package org.apache.solr.core;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.ServerSocket;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -30,8 +29,10 @@ import org.apache.solr.SolrTestCaseJ4;
|
||||||
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
|
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
|
||||||
import org.apache.solr.common.util.Pair;
|
import org.apache.solr.common.util.Pair;
|
||||||
import org.apache.solr.util.RestTestHarness;
|
import org.apache.solr.util.RestTestHarness;
|
||||||
|
import org.eclipse.jetty.server.Connector;
|
||||||
import org.eclipse.jetty.server.Request;
|
import org.eclipse.jetty.server.Request;
|
||||||
import org.eclipse.jetty.server.Server;
|
import org.eclipse.jetty.server.Server;
|
||||||
|
import org.eclipse.jetty.server.ServerConnector;
|
||||||
import org.eclipse.jetty.server.handler.AbstractHandler;
|
import org.eclipse.jetty.server.handler.AbstractHandler;
|
||||||
import org.junit.BeforeClass;
|
import org.junit.BeforeClass;
|
||||||
|
|
||||||
|
@ -48,22 +49,9 @@ public class TestDynamicLoadingUrl extends AbstractFullDistribZkTestBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Pair<Server, Integer> runHttpServer(Map<String, Object> jars) throws Exception {
|
public static Pair<Server, Integer> runHttpServer(Map<String, Object> jars) throws Exception {
|
||||||
int port = 0;
|
final Server server = new Server();
|
||||||
int start = 30000 + random().nextInt(10000);//start at somewhere between 30000 - 40000
|
final ServerConnector connector = new ServerConnector(server);
|
||||||
for (int i = start; i < (start+1000); i++) {//check ports one by one
|
server.setConnectors(new Connector[] { connector });
|
||||||
try {
|
|
||||||
new ServerSocket(i).close();
|
|
||||||
port = i;
|
|
||||||
break;
|
|
||||||
} catch (IOException e) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (port == 0) {
|
|
||||||
fail("No port to be found");
|
|
||||||
}
|
|
||||||
Server server = null;
|
|
||||||
server = new Server(port);
|
|
||||||
server.setHandler(new AbstractHandler() {
|
server.setHandler(new AbstractHandler() {
|
||||||
@Override
|
@Override
|
||||||
public void handle(String s, Request request, HttpServletRequest req, HttpServletResponse rsp)
|
public void handle(String s, Request request, HttpServletRequest req, HttpServletResponse rsp)
|
||||||
|
@ -78,7 +66,7 @@ public class TestDynamicLoadingUrl extends AbstractFullDistribZkTestBase {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
server.start();
|
server.start();
|
||||||
return new Pair<>(server, port);
|
return new Pair<>(server, connector.getLocalPort());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testDynamicLoadingUrl() throws Exception {
|
public void testDynamicLoadingUrl() throws Exception {
|
||||||
|
@ -106,7 +94,7 @@ public class TestDynamicLoadingUrl extends AbstractFullDistribZkTestBase {
|
||||||
"/config/overlay",
|
"/config/overlay",
|
||||||
null,
|
null,
|
||||||
Arrays.asList("overlay", "runtimeLib", "urljar", "sha512"),
|
Arrays.asList("overlay", "runtimeLib", "urljar", "sha512"),
|
||||||
"d01b51de67ae1680a84a813983b1de3b592fc32f1a22b662fc9057da5953abd1b72476388ba342cad21671cd0b805503c78ab9075ff2f3951fdf75fa16981420", 10);
|
"d01b51de67ae1680a84a813983b1de3b592fc32f1a22b662fc9057da5953abd1b72476388ba342cad21671cd0b805503c78ab9075ff2f3951fdf75fa16981420", 120);
|
||||||
|
|
||||||
payload = "{\n" +
|
payload = "{\n" +
|
||||||
"'create-requesthandler' : { 'name' : '/runtime', 'class': 'org.apache.solr.core.RuntimeLibReqHandler', 'runtimeLib' : true}" +
|
"'create-requesthandler' : { 'name' : '/runtime', 'class': 'org.apache.solr.core.RuntimeLibReqHandler', 'runtimeLib' : true}" +
|
||||||
|
@ -119,14 +107,14 @@ public class TestDynamicLoadingUrl extends AbstractFullDistribZkTestBase {
|
||||||
"/config/overlay",
|
"/config/overlay",
|
||||||
null,
|
null,
|
||||||
Arrays.asList("overlay", "requestHandler", "/runtime", "class"),
|
Arrays.asList("overlay", "requestHandler", "/runtime", "class"),
|
||||||
"org.apache.solr.core.RuntimeLibReqHandler", 10);
|
"org.apache.solr.core.RuntimeLibReqHandler", 120);
|
||||||
|
|
||||||
Map result = TestSolrConfigHandler.testForResponseElement(client,
|
Map result = TestSolrConfigHandler.testForResponseElement(client,
|
||||||
null,
|
null,
|
||||||
"/runtime",
|
"/runtime",
|
||||||
null,
|
null,
|
||||||
Arrays.asList("class"),
|
Arrays.asList("class"),
|
||||||
"org.apache.solr.core.RuntimeLibReqHandler", 10);
|
"org.apache.solr.core.RuntimeLibReqHandler", 120);
|
||||||
compareValues(result, MemClassLoader.class.getName(), asList("loader"));
|
compareValues(result, MemClassLoader.class.getName(), asList("loader"));
|
||||||
} finally {
|
} finally {
|
||||||
pair.first().stop();
|
pair.first().stop();
|
||||||
|
|
Loading…
Reference in New Issue