Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix more startup problems

This commit is contained in:
Fangjin Yang 2013-03-19 12:45:35 -07:00
parent 69a0e0e1a7
commit e5f46f2a66
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
View File

@ -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.config.TaskConfig;
import com.metamx.druid.merger.common.index.StaticS3FirehoseFactory; import com.metamx.druid.merger.common.index.StaticS3FirehoseFactory;
import com.metamx.druid.merger.coordinator.ForkingTaskRunner; 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.config.ForkingTaskRunnerConfig;
import com.metamx.druid.merger.coordinator.http.IndexerCoordinatorServletModule;
import com.metamx.druid.merger.worker.Worker; import com.metamx.druid.merger.worker.Worker;
import com.metamx.druid.merger.worker.WorkerCuratorCoordinator; import com.metamx.druid.merger.worker.WorkerCuratorCoordinator;
import com.metamx.druid.merger.worker.WorkerTaskMonitor; import com.metamx.druid.merger.worker.WorkerTaskMonitor;

6
merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerResource.java
View File

@ -3,7 +3,7 @@ package com.metamx.druid.merger.worker.http;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.metamx.common.logger.Logger; 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.Consumes;
import javax.ws.rs.POST; import javax.ws.rs.POST;
@ -19,12 +19,12 @@ public class WorkerResource
private static final Logger log = new Logger(WorkerResource.class); private static final Logger log = new Logger(WorkerResource.class);
private final ObjectMapper jsonMapper; private final ObjectMapper jsonMapper;
private final TaskRunner taskRunner; private final ForkingTaskRunner taskRunner;
@Inject @Inject
public WorkerResource( public WorkerResource(
ObjectMapper jsonMapper, ObjectMapper jsonMapper,
TaskRunner taskRunner ForkingTaskRunner taskRunner
) throws Exception ) throws Exception
{ {

2
merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerServletModule.java
View File

@ -33,7 +33,7 @@ public class WorkerServletModule extends JerseyServletModule
@Override @Override
protected void configureServlets() protected void configureServlets()
{ {
bind(IndexerCoordinatorResource.class); bind(WorkerResource.class);
bind(ObjectMapper.class).toInstance(jsonMapper); bind(ObjectMapper.class).toInstance(jsonMapper);
bind(ServiceEmitter.class).toInstance(emitter); bind(ServiceEmitter.class).toInstance(emitter);
bind(ForkingTaskRunner.class).toInstance(forkingTaskRunner); bind(ForkingTaskRunner.class).toInstance(forkingTaskRunner);