From 3152d08844678d0248e296cad6f3637931ee284d Mon Sep 17 00:00:00 2001
From: Charles Allen <charles@allen-net.com>
Date: Wed, 20 Jan 2016 14:15:24 -0800
Subject: [PATCH] Fix overlord scheduled executor injection * Fixes
 https://github.com/druid-io/druid/issues/2308

---
 .../overlord/RemoteTaskRunnerFactory.java        |  6 ++----
 .../SimpleResourceManagementStrategy.java        | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java b/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java
index 9f94635f0b3..b4b046425e6 100644
--- a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java
+++ b/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java
@@ -30,7 +30,6 @@ import io.druid.guice.annotations.Global;
 import io.druid.indexing.overlord.autoscaling.NoopResourceManagementStrategy;
 import io.druid.indexing.overlord.autoscaling.ResourceManagementSchedulerConfig;
 import io.druid.indexing.overlord.autoscaling.ResourceManagementStrategy;
-import io.druid.indexing.overlord.autoscaling.ScalingStats;
 import io.druid.indexing.overlord.autoscaling.SimpleResourceManagementConfig;
 import io.druid.indexing.overlord.autoscaling.SimpleResourceManagementStrategy;
 import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig;
@@ -66,8 +65,7 @@ public class RemoteTaskRunnerFactory implements TaskRunnerFactory<RemoteTaskRunn
       final Supplier<WorkerBehaviorConfig> workerConfigRef,
       final ScheduledExecutorFactory factory,
       final SimpleResourceManagementConfig config,
-      final ResourceManagementSchedulerConfig resourceManagementSchedulerConfig,
-      final ScheduledExecutorService exec
+      final ResourceManagementSchedulerConfig resourceManagementSchedulerConfig
   )
   {
     this.curator = curator;
@@ -79,7 +77,7 @@ public class RemoteTaskRunnerFactory implements TaskRunnerFactory<RemoteTaskRunn
     this.cleanupExec = factory.create(1, "RemoteTaskRunner-Scheduled-Cleanup--%d");
     this.config = config;
     this.resourceManagementSchedulerConfig = resourceManagementSchedulerConfig;
-    this.exec = exec;
+    this.exec = factory.create(1, "RemoteTaskRunner-ResourceManagement--%d");
   }
 
   @Override
diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleResourceManagementStrategy.java b/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleResourceManagementStrategy.java
index 120f5f3faf2..5b82f0315b0 100644
--- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleResourceManagementStrategy.java
+++ b/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleResourceManagementStrategy.java
@@ -29,6 +29,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.metamx.common.ISE;
+import com.metamx.common.concurrent.ScheduledExecutorFactory;
 import com.metamx.common.concurrent.ScheduledExecutors;
 import com.metamx.emitter.EmittingLogger;
 import io.druid.granularity.PeriodGranularity;
@@ -69,6 +70,21 @@ public class SimpleResourceManagementStrategy implements ResourceManagementStrat
   private DateTime lastTerminateTime = new DateTime();
 
   @Inject
+  public SimpleResourceManagementStrategy(
+      SimpleResourceManagementConfig config,
+      Supplier<WorkerBehaviorConfig> workerConfigRef,
+      ResourceManagementSchedulerConfig resourceManagementSchedulerConfig,
+      ScheduledExecutorFactory factory
+  )
+  {
+    this(
+        config,
+        workerConfigRef,
+        resourceManagementSchedulerConfig,
+        factory.create(1, "SimpleResourceManagement-manager--%d")
+    );
+  }
+
   public SimpleResourceManagementStrategy(
       SimpleResourceManagementConfig config,
       Supplier<WorkerBehaviorConfig> workerConfigRef,