Skip to content

CliCoordinator: LoadQueueTaskMaster should use an escalated http client. #5329

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
himanshug merged 1 commit into from
Feb 2, 2018
Merged

CliCoordinator: LoadQueueTaskMaster should use an escalated http client. #5329

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
10 changes: 3 additions & 7 deletions server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@
package io.druid.server.coordinator;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Inject;
import io.druid.java.util.http.client.HttpClient;
import io.druid.client.ImmutableDruidServer;
import io.druid.guice.annotations.Global;
import io.druid.guice.annotations.Json;
import io.druid.java.util.http.client.HttpClient;
import io.druid.server.initialization.ZkPathsConfig;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.utils.ZKPaths;
Expand All @@ -45,14 +42,13 @@ public class LoadQueueTaskMaster
private final HttpClient httpClient;
private final ZkPathsConfig zkPaths;

@Inject
public LoadQueueTaskMaster(
CuratorFramework curator,
@Json ObjectMapper jsonMapper,
ObjectMapper jsonMapper,
ScheduledExecutorService peonExec,
ExecutorService callbackExec,
DruidCoordinatorConfig config,
@Global HttpClient httpClient,
HttpClient httpClient,
ZkPathsConfig zkPaths
)
{
Expand Down
6 changes: 3 additions & 3 deletions services/src/main/java/io/druid/cli/CliCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.google.inject.Module;
import com.google.inject.Provides;
import com.google.inject.name.Names;
import io.druid.java.util.http.client.HttpClient;
import io.airlift.airline.Command;
import io.druid.audit.AuditManager;
import io.druid.client.CoordinatorServerView;
Expand All @@ -44,9 +43,10 @@
import io.druid.guice.LifecycleModule;
import io.druid.guice.ManageLifecycle;
import io.druid.guice.annotations.CoordinatorIndexingServiceHelper;
import io.druid.guice.annotations.Global;
import io.druid.guice.annotations.EscalatedGlobal;
import io.druid.java.util.common.concurrent.ScheduledExecutorFactory;
import io.druid.java.util.common.logger.Logger;
import io.druid.java.util.http.client.HttpClient;
import io.druid.metadata.MetadataRuleManager;
import io.druid.metadata.MetadataRuleManagerConfig;
import io.druid.metadata.MetadataRuleManagerProvider;
Expand Down Expand Up @@ -232,7 +232,7 @@ public LoadQueueTaskMaster getLoadQueueTaskMaster(
ObjectMapper jsonMapper,
ScheduledExecutorFactory factory,
DruidCoordinatorConfig config,
@Global HttpClient httpClient,
@EscalatedGlobal HttpClient httpClient,
ZkPathsConfig zkPaths
)
{
Expand Down