Skip to content

Fetch active task payloads from memory #15377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhishekagarwal87 merged 3 commits into from
Nov 17, 2023
Merged

Fetch active task payloads from memory #15377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c68b0b
Fetch active task paylaods from memory
AmatyaAvadhanula Nov 15, 2023
a64d56b
Utilize in-memory task map in TaskQueue
AmatyaAvadhanula Nov 15, 2023
7412ed3
Fetch only active tasks from TaskQueue
AmatyaAvadhanula Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,17 @@ public CoordinatorRunStats getQueueStats()
return stats;
}

public Optional<Task> getActiveTask(String id)
{
giant.lock();
try {
return Optional.fromNullable(tasks.get(id));
}
finally {
giant.unlock();
}
}

@VisibleForTesting
List<Task> getTasks()
{
Expand Down
10 changes: 9 additions & 1 deletion ...ing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorageQueryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@ public class TaskStorageQueryAdapter
{
private final TaskStorage storage;
private final TaskLockbox taskLockbox;
private final Optional<TaskQueue> taskQueue;

@Inject
public TaskStorageQueryAdapter(TaskStorage storage, TaskLockbox taskLockbox)
public TaskStorageQueryAdapter(TaskStorage storage, TaskLockbox taskLockbox, TaskMaster taskMaster)
{
this.storage = storage;
this.taskLockbox = taskLockbox;
this.taskQueue = taskMaster.getTaskQueue();
}

public List<Task> getActiveTasks()
Expand Down Expand Up @@ -104,6 +106,12 @@ public List<TaskStatusPlus> getTaskStatusPlusList(

public Optional<Task> getTask(final String taskid)
{
if (taskQueue.isPresent()) {
Optional<Task> activeTask = taskQueue.get().getActiveTask(taskid);
if (activeTask.isPresent()) {
return activeTask;
}
}
return storage.getTask(taskid);
}

Expand Down
5 changes: 4 additions & 1 deletion indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,10 @@ private TaskStorage setUpTaskStorage()
default:
throw new RE("Unknown task storage type [%s]", taskStorageType);
}
tsqa = new TaskStorageQueryAdapter(taskStorage, taskLockbox);
TaskMaster taskMaster = EasyMock.createMock(TaskMaster.class);
EasyMock.expect(taskMaster.getTaskQueue()).andReturn(Optional.absent()).anyTimes();
EasyMock.replay(taskMaster);
tsqa = new TaskStorageQueryAdapter(taskStorage, taskLockbox, taskMaster);
return taskStorage;
}

Expand Down
2 changes: 1 addition & 1 deletion indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public void testOverlordRun() throws Exception
Assert.assertEquals(taskMaster.getCurrentLeader(), druidNode.getHostAndPort());
Assert.assertEquals(Optional.absent(), taskMaster.getRedirectLocation());

final TaskStorageQueryAdapter taskStorageQueryAdapter = new TaskStorageQueryAdapter(taskStorage, taskLockbox);
final TaskStorageQueryAdapter taskStorageQueryAdapter = new TaskStorageQueryAdapter(taskStorage, taskLockbox, taskMaster);
final WorkerTaskRunnerQueryAdapter workerTaskRunnerQueryAdapter = new WorkerTaskRunnerQueryAdapter(taskMaster, null);
// Test Overlord resource stuff
overlordResource = new OverlordResource(
Expand Down