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

Merge pull request #2585 from gianm/overlord-workers-api 

OverlordResource: Use getZkWorkers on RemoteTaskRunner.
This commit is contained in:
Fangjin Yang 2016-03-02 18:15:05 -08:00
parent d06c1c5c85 e9c23bf376
commit 703dc7a48f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordResource.java
View File

@ -45,6 +45,7 @@ import io.druid.indexing.overlord.TaskQueue;
import io.druid.indexing.overlord.TaskRunner;
import io.druid.indexing.overlord.TaskRunnerWorkItem;
import io.druid.indexing.overlord.TaskStorageQueryAdapter;
import io.druid.indexing.overlord.WorkerTaskRunner;
import io.druid.indexing.overlord.autoscaling.ScalingStats;
import io.druid.indexing.overlord.setup.WorkerBehaviorConfig;
import io.druid.metadata.EntryExistsException;
@ -416,7 +417,10 @@ public class OverlordResource
public Response apply(TaskRunner taskRunner)
{
if (taskRunner instanceof RemoteTaskRunner) {
return Response.ok(((RemoteTaskRunner) taskRunner).getWorkers()).build();
// Use getZkWorkers instead of getWorkers, as they return richer details (like the list of running tasks)
return Response.ok(((RemoteTaskRunner) taskRunner).getZkWorkers()).build();
} else if (taskRunner instanceof WorkerTaskRunner) {
return Response.ok(((WorkerTaskRunner) taskRunner).getWorkers()).build();
} else {
log.debug(
"Task runner [%s] of type [%s] does not support listing workers",