From 640a3973017123b388e316e39e392379b18c671f Mon Sep 17 00:00:00 2001
From: Gian Merlino <gian@imply.io>
Date: Fri, 2 Feb 2018 01:06:08 -0800
Subject: [PATCH] CliCoordinator: LoadQueueTaskMaster should use an escalated
 http client.

Also remove Guice annotations from LoadQueueTaskMaster, since it is
provided by CliCoordinator, so Guice does not need to know how to
build one directly.
---
 .../druid/server/coordinator/LoadQueueTaskMaster.java  | 10 +++-------
 .../src/main/java/io/druid/cli/CliCoordinator.java     |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java b/server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java
index f395e09be17a..e48140f182b5 100644
--- a/server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java
+++ b/server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java
@@ -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;
@@ -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
   )
   {
diff --git a/services/src/main/java/io/druid/cli/CliCoordinator.java b/services/src/main/java/io/druid/cli/CliCoordinator.java
index 64fdb04a6e59..2e3762d2d2fa 100644
--- a/services/src/main/java/io/druid/cli/CliCoordinator.java
+++ b/services/src/main/java/io/druid/cli/CliCoordinator.java
@@ -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;
@@ -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;
@@ -232,7 +232,7 @@ public LoadQueueTaskMaster getLoadQueueTaskMaster(
               ObjectMapper jsonMapper,
               ScheduledExecutorFactory factory,
               DruidCoordinatorConfig config,
-              @Global HttpClient httpClient,
+              @EscalatedGlobal HttpClient httpClient,
               ZkPathsConfig zkPaths
           )
           {