diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java index 33720614ff0..c5f977d99ef 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java @@ -43,9 +43,7 @@ import com.metamx.druid.merger.common.config.IndexerZkConfig; import com.metamx.druid.merger.common.config.TaskConfig; import com.metamx.druid.merger.common.index.StaticS3FirehoseFactory; import com.metamx.druid.merger.coordinator.ForkingTaskRunner; -import com.metamx.druid.merger.coordinator.TaskStorageQueryAdapter; import com.metamx.druid.merger.coordinator.config.ForkingTaskRunnerConfig; -import com.metamx.druid.merger.coordinator.http.IndexerCoordinatorServletModule; import com.metamx.druid.merger.worker.Worker; import com.metamx.druid.merger.worker.WorkerCuratorCoordinator; import com.metamx.druid.merger.worker.WorkerTaskMonitor; diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerResource.java b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerResource.java index 2bd55df1b15..02adeb427b0 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerResource.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerResource.java @@ -3,7 +3,7 @@ package com.metamx.druid.merger.worker.http; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; import com.metamx.common.logger.Logger; -import com.metamx.druid.merger.coordinator.TaskRunner; +import com.metamx.druid.merger.coordinator.ForkingTaskRunner; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -19,12 +19,12 @@ public class WorkerResource private static final Logger log = new Logger(WorkerResource.class); private final ObjectMapper jsonMapper; - private final TaskRunner taskRunner; + private final ForkingTaskRunner taskRunner; @Inject public WorkerResource( ObjectMapper jsonMapper, - TaskRunner taskRunner + ForkingTaskRunner taskRunner ) throws Exception { diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerServletModule.java b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerServletModule.java index a3e798a1504..ad50b18480a 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerServletModule.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerServletModule.java @@ -33,7 +33,7 @@ public class WorkerServletModule extends JerseyServletModule @Override protected void configureServlets() { - bind(IndexerCoordinatorResource.class); + bind(WorkerResource.class); bind(ObjectMapper.class).toInstance(jsonMapper); bind(ServiceEmitter.class).toInstance(emitter); bind(ForkingTaskRunner.class).toInstance(forkingTaskRunner);