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

Reset `RuntimeInfo` to fix flaky test `ParametrizedUriEmitterConfigTest`. (#14405) 

* Add injector so JVM settings are correctly set up and bound for the test.

* Add VisibleForTesting IDE annotation.

* spacing
This commit is contained in:
Abhishek Radhakrishnan 2023-06-13 18:07:51 -07:00 committed by GitHub
parent b8495d45a1
commit be5a6593a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
processing/src/main/java/org/apache/druid/utils/JvmUtils.java
View File

@ -19,6 +19,7 @@
package org.apache.druid.utils;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.primitives.Ints;
import com.google.inject.Inject;
@ -144,6 +145,7 @@ public class JvmUtils
/**
* Only for testing.
*/
@VisibleForTesting
public static void resetTestsToDefaultRuntimeInfo()
{
RUNTIME_INFO = new RuntimeInfo();

49
processing/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java
View File

@ -20,8 +20,12 @@
package org.apache.druid.java.util.emitter.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.apache.druid.java.util.common.Pair;
import org.apache.druid.utils.JvmUtils;
import org.apache.druid.utils.RuntimeInfo;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Test;
@ -29,20 +33,40 @@ import java.util.Properties;
public class ParametrizedUriEmitterConfigTest
{
/**
* The JVM RuntimeInfo is static, and the default settings that depend on it such
* as {@link BaseHttpEmittingConfig#DEFAULT_BATCH_QUEUE_SIZE_LIMIT} are static as well. So bind the runtime info
* for this test, so it doesn't get pawned by other tests setting the runtime to different values.
*/
private static Injector makeInjector(Properties props)
{
return Guice.createInjector(
binder -> {
JvmUtils.resetTestsToDefaultRuntimeInfo();
binder.bind(RuntimeInfo.class)
.toInstance(JvmUtils.getRuntimeInfo());
binder.requestStaticInjection(JvmUtils.class);
final ParametrizedUriEmitterConfig paramConfig = new ObjectMapper().convertValue(
Emitters.makeCustomFactoryMap(props), ParametrizedUriEmitterConfig.class);
final HttpEmitterConfig httpEmitterConfig = paramConfig.buildHttpEmitterConfig("http://example.com/topic");
binder.bind(HttpEmitterConfig.class).toInstance(httpEmitterConfig);
}
);
}
@AfterClass
public static void teardown()
{
JvmUtils.resetTestsToDefaultRuntimeInfo();
}
@Test
public void testDefaults()
{
final Properties props = new Properties();
final Injector injector = makeInjector(new Properties());
final HttpEmitterConfig config = injector.getInstance(HttpEmitterConfig.class);
final ObjectMapper objectMapper = new ObjectMapper();
final ParametrizedUriEmitterConfig paramConfig = objectMapper.convertValue(Emitters.makeCustomFactoryMap(props), ParametrizedUriEmitterConfig.class);
final HttpEmitterConfig config = paramConfig.buildHttpEmitterConfig("http://example.com/topic");
Assert.assertEquals(60000, config.getFlushMillis());
Assert.assertEquals(500, config.getFlushCount());
Assert.assertEquals("http://example.com/topic", config.getRecipientBaseUrl());
Assert.assertNull(config.getBasicAuthentication());
Assert.assertEquals(BatchingStrategy.ARRAY, config.getBatchingStrategy());
Pair<Integer, Integer> batchConfigPair = BaseHttpEmittingConfig.getDefaultBatchSizeAndLimit(
JvmUtils.getRuntimeInfo().getMaxHeapSizeBytes()
);
@ -62,9 +86,8 @@ public class ParametrizedUriEmitterConfigTest
props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.maxBatchSize", "4");
props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.flushTimeOut", "1000");
final ObjectMapper objectMapper = new ObjectMapper();
final ParametrizedUriEmitterConfig paramConfig = objectMapper.convertValue(Emitters.makeCustomFactoryMap(props), ParametrizedUriEmitterConfig.class);
final HttpEmitterConfig config = paramConfig.buildHttpEmitterConfig("http://example.com/topic");
final Injector injector = makeInjector(props);
final HttpEmitterConfig config = injector.getInstance(HttpEmitterConfig.class);
Assert.assertEquals(1, config.getFlushMillis());
Assert.assertEquals(2, config.getFlushCount());