mirror of https://github.com/apache/druid.git
Fix unit tests and GC settings for Java 15 (#11074)
* JavaScript script engine support was removed in JDK 15: skip those tests for JDKs without it * Fix flaky HTTP client tests with Java 15 * Switch from CMS to G1GC in integration tests, since CMS is no longer available in JDK 15
This commit is contained in:
parent
fb6751fa45
commit
15bdd6bc2f
|
@ -41,6 +41,7 @@ import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.net.ServerSocket;
|
import java.net.ServerSocket;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
|
import java.net.SocketException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
|
@ -298,6 +299,7 @@ public class JankyServersTest
|
||||||
public boolean isChannelClosedException(Throwable e)
|
public boolean isChannelClosedException(Throwable e)
|
||||||
{
|
{
|
||||||
return e instanceof ChannelException ||
|
return e instanceof ChannelException ||
|
||||||
|
(e instanceof SocketException && e.getMessage().contains("Connection reset")) ||
|
||||||
(e instanceof IOException && e.getMessage().contains("Connection reset by peer"));
|
(e instanceof IOException && e.getMessage().contains("Connection reset by peer"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,10 +32,14 @@ import org.easymock.EasyMock;
|
||||||
import org.hamcrest.CoreMatchers;
|
import org.hamcrest.CoreMatchers;
|
||||||
import org.joda.time.Period;
|
import org.joda.time.Period;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
import org.junit.Assume;
|
||||||
|
import org.junit.Before;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.rules.ExpectedException;
|
import org.junit.rules.ExpectedException;
|
||||||
|
|
||||||
|
import javax.script.ScriptEngineManager;
|
||||||
|
|
||||||
public class JavaScriptWorkerSelectStrategyTest
|
public class JavaScriptWorkerSelectStrategyTest
|
||||||
{
|
{
|
||||||
@Rule
|
@Rule
|
||||||
|
@ -71,6 +75,13 @@ public class JavaScriptWorkerSelectStrategyTest
|
||||||
JavaScriptConfig.getEnabledInstance()
|
JavaScriptConfig.getEnabledInstance()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void checkJdkCompatibility()
|
||||||
|
{
|
||||||
|
// skip tests for newer JDKs without javascript support
|
||||||
|
Assume.assumeNotNull(new ScriptEngineManager().getEngineByName("javascript"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSerde() throws Exception
|
public void testSerde() throws Exception
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,7 +21,7 @@ DRUID_SERVICE=router
|
||||||
DRUID_LOG_PATH=/shared/logs/router-custom-check-tls.log
|
DRUID_LOG_PATH=/shared/logs/router-custom-check-tls.log
|
||||||
|
|
||||||
# JAVA OPTS
|
# JAVA OPTS
|
||||||
SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5003
|
SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5003
|
||||||
|
|
||||||
# Druid configs
|
# Druid configs
|
||||||
druid_plaintextPort=8891
|
druid_plaintextPort=8891
|
||||||
|
|
|
@ -21,7 +21,7 @@ DRUID_SERVICE=router
|
||||||
DRUID_LOG_PATH=/shared/logs/router-no-client-auth-tls.log
|
DRUID_LOG_PATH=/shared/logs/router-no-client-auth-tls.log
|
||||||
|
|
||||||
# JAVA OPTS
|
# JAVA OPTS
|
||||||
SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5002
|
SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5002
|
||||||
|
|
||||||
# Druid configs
|
# Druid configs
|
||||||
druid_plaintextPort=8890
|
druid_plaintextPort=8890
|
||||||
|
|
|
@ -21,7 +21,7 @@ DRUID_SERVICE=router
|
||||||
DRUID_LOG_PATH=/shared/logs/router-permissive-tls.log
|
DRUID_LOG_PATH=/shared/logs/router-permissive-tls.log
|
||||||
|
|
||||||
# JAVA OPTS
|
# JAVA OPTS
|
||||||
SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001
|
SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001
|
||||||
|
|
||||||
# Druid configs
|
# Druid configs
|
||||||
druid_plaintextPort=8889
|
druid_plaintextPort=8889
|
||||||
|
|
|
@ -32,10 +32,13 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
|
||||||
import org.apache.druid.query.topn.TopNQueryBuilder;
|
import org.apache.druid.query.topn.TopNQueryBuilder;
|
||||||
import org.hamcrest.CoreMatchers;
|
import org.hamcrest.CoreMatchers;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
import org.junit.Assume;
|
||||||
|
import org.junit.Before;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.rules.ExpectedException;
|
import org.junit.rules.ExpectedException;
|
||||||
|
|
||||||
|
import javax.script.ScriptEngineManager;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
|
||||||
public class JavaScriptTieredBrokerSelectorStrategyTest
|
public class JavaScriptTieredBrokerSelectorStrategyTest
|
||||||
|
@ -48,6 +51,13 @@ public class JavaScriptTieredBrokerSelectorStrategyTest
|
||||||
JavaScriptConfig.getEnabledInstance()
|
JavaScriptConfig.getEnabledInstance()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void checkJdkCompatibility()
|
||||||
|
{
|
||||||
|
// skip tests for newer JDKs without javascript support
|
||||||
|
Assume.assumeNotNull(new ScriptEngineManager().getEngineByName("javascript"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSerde() throws Exception
|
public void testSerde() throws Exception
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue