Skip to content

[Backport]make AsyncHttpCLient instance timer thread daemon (#5076) #5083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gianm merged 1 commit into from
Nov 14, 2017
Merged

[Backport]make AsyncHttpCLient instance timer thread daemon (#5076) #5083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions server/src/main/java/io/druid/server/emitter/HttpEmitterModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Supplier;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.Binder;
import com.google.inject.Module;
import com.google.inject.Provides;
Expand All @@ -30,12 +29,14 @@
import com.metamx.emitter.core.Emitter;
import com.metamx.emitter.core.HttpEmitterConfig;
import com.metamx.emitter.core.HttpPostEmitter;
import io.druid.concurrent.Execs;
import io.druid.guice.JsonConfigProvider;
import io.druid.guice.LazySingleton;
import io.druid.guice.ManageLifecycle;
import io.druid.java.util.common.lifecycle.Lifecycle;
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.JdkSslContext;
import io.netty.util.HashedWheelTimer;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClientConfig;
Expand Down Expand Up @@ -71,16 +72,13 @@ static void configureSsl(Binder binder)

static AsyncHttpClient createAsyncHttpClient(
String nameFormat,
String timerThreadNameFormat,
@Nullable SSLContext sslContext
)
{
final DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder()
.setThreadFactory(
new ThreadFactoryBuilder()
.setDaemon(true)
.setNameFormat(nameFormat)
.build()
);
.setThreadFactory(Execs.makeThreadFactory(nameFormat))
.setNettyTimer(new HashedWheelTimer(Execs.makeThreadFactory(timerThreadNameFormat)));
if (sslContext != null) {
builder.setSslContext(new JdkSslContext(sslContext, true, ClientAuth.NONE));
}
Expand All @@ -100,7 +98,11 @@ public Emitter getEmitter(
return new HttpPostEmitter(
config.get(),
lifecycle.addCloseableInstance(
createAsyncHttpClient("HttpPostEmitter-AsyncHttpClient-%d", sslContext)
createAsyncHttpClient(
"HttpPostEmitter-AsyncHttpClient-%d",
"HttpPostEmitter-AsyncHttpClient-Timer-%d",
sslContext
)
),
jsonMapper
);
Expand Down
6 changes: 5 additions & 1 deletion server/src/main/java/io/druid/server/emitter/ParametrizedUriEmitterModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ public Emitter getEmitter(
return new ParametrizedUriEmitter(
config.get(),
lifecycle.addCloseableInstance(
HttpEmitterModule.createAsyncHttpClient("ParmetrizedUriEmitter-AsyncHttpClient-%d", sslContext)
HttpEmitterModule.createAsyncHttpClient(
"ParmetrizedUriEmitter-AsyncHttpClient-%d",
"ParmetrizedUriEmitter-AsyncHttpClient-Timer-%d",
sslContext
)
),
jsonMapper
);
Expand Down