Skip to content
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

Move segment update APIs from Coordinator to Overlord #17545

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Move segment update APIs from Coordinator to Overlord #17545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9740f79
Add OverlordDataSourcesResource
kfaraz Dec 6, 2024
676873a
Fix checkstyle
kfaraz Dec 6, 2024
4a16b26
Minor fixes
kfaraz Dec 6, 2024
6844ce9
Fix tests
kfaraz Dec 7, 2024
ef2985a
Register DataSourcesResource
kfaraz Dec 8, 2024
87d5616
Add tests
kfaraz Dec 9, 2024
485774b
OverlordClient is never null
kfaraz Dec 9, 2024
28c2ea7
Fix up tests
kfaraz Dec 9, 2024
60a1881
Add OverlordDataSourcesResourceTest
kfaraz Dec 11, 2024
f55e813
Handle rolling upgrades
kfaraz Dec 12, 2024
7164f09
Fix API response objects
kfaraz Dec 12, 2024
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
2 changes: 1 addition & 1 deletion extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import org.apache.druid.client.indexing.NoopOverlordClient;
import org.apache.druid.client.indexing.TaskStatusResponse;
import org.apache.druid.common.guava.FutureUtils;
import org.apache.druid.indexer.RunnerTaskState;
Expand All @@ -48,6 +47,7 @@
import org.apache.druid.msq.indexing.error.TooManyWorkersFault;
import org.apache.druid.msq.indexing.error.UnknownFault;
import org.apache.druid.msq.indexing.error.WorkerRpcFailedFault;
import org.apache.druid.rpc.indexing.NoopOverlordClient;
import org.apache.druid.segment.column.ColumnHolder;
import org.apache.druid.utils.CollectionUtils;
import org.junit.Assert;
Expand Down
2 changes: 1 addition & 1 deletion ...e/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.google.inject.Injector;
import org.apache.druid.client.ImmutableSegmentLoadInfo;
import org.apache.druid.client.coordinator.CoordinatorClient;
import org.apache.druid.client.indexing.NoopOverlordClient;
import org.apache.druid.client.indexing.TaskStatusResponse;
import org.apache.druid.common.guava.FutureUtils;
import org.apache.druid.indexer.RunnerTaskState;
Expand Down Expand Up @@ -67,6 +66,7 @@
import org.apache.druid.msq.util.MultiStageQueryContext;
import org.apache.druid.query.Query;
import org.apache.druid.query.QueryContext;
import org.apache.druid.rpc.indexing.NoopOverlordClient;
import org.apache.druid.rpc.indexing.OverlordClient;
import org.apache.druid.server.DruidNode;
import org.mockito.ArgumentMatchers;
Expand Down
2 changes: 1 addition & 1 deletion ...lti-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.google.inject.Injector;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.druid.client.ImmutableSegmentLoadInfo;
import org.apache.druid.client.indexing.NoopOverlordClient;
import org.apache.druid.client.indexing.TaskPayloadResponse;
import org.apache.druid.client.indexing.TaskStatusResponse;
import org.apache.druid.indexer.TaskStatus;
Expand All @@ -48,6 +47,7 @@
import org.apache.druid.msq.indexing.report.MSQStatusReport;
import org.apache.druid.msq.indexing.report.MSQTaskReport;
import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
import org.apache.druid.rpc.indexing.NoopOverlordClient;
import org.joda.time.DateTime;

import javax.annotation.Nullable;
Expand Down
74 changes: 2 additions & 72 deletions indexing-service/src/main/java/org/apache/druid/indexing/compact/LocalOverlordClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,25 @@
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.druid.client.indexing.ClientCompactionTaskQuery;
import org.apache.druid.client.indexing.IndexingTotalWorkerCapacityInfo;
import org.apache.druid.client.indexing.IndexingWorkerInfo;
import org.apache.druid.client.indexing.TaskPayloadResponse;
import org.apache.druid.client.indexing.TaskStatusResponse;
import org.apache.druid.error.DruidException;
import org.apache.druid.indexer.TaskStatus;
import org.apache.druid.indexer.TaskStatusPlus;
import org.apache.druid.indexer.report.TaskReport;
import org.apache.druid.indexing.common.task.CompactionTask;
import org.apache.druid.indexing.overlord.TaskMaster;
import org.apache.druid.indexing.overlord.TaskQueryTool;
import org.apache.druid.indexing.overlord.TaskQueue;
import org.apache.druid.indexing.overlord.http.TotalWorkerCapacityResponse;
import org.apache.druid.indexing.overlord.supervisor.SupervisorStatus;
import org.apache.druid.java.util.common.CloseableIterators;
import org.apache.druid.java.util.common.concurrent.Execs;
import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.java.util.common.parsers.CloseableIterator;
import org.apache.druid.metadata.LockFilterPolicy;
import org.apache.druid.rpc.ServiceRetryPolicy;
import org.apache.druid.rpc.indexing.OverlordClient;
import org.apache.druid.server.compaction.CompactionProgressResponse;
import org.apache.druid.server.compaction.CompactionStatusResponse;
import org.apache.druid.rpc.indexing.NoopOverlordClient;
import org.joda.time.Interval;

import javax.annotation.Nullable;
import java.io.IOException;
import java.net.URI;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand All @@ -62,7 +54,7 @@
* task related info. This client simply redirects all queries to the
* {@link TaskQueryTool} and all updates to the {@link TaskQueue}.
*/
class LocalOverlordClient implements OverlordClient
class LocalOverlordClient extends NoopOverlordClient
{
private static final Logger log = new Logger(LocalOverlordClient.class);

Expand Down Expand Up @@ -199,66 +191,4 @@ private <U, V> V convertTask(Object taskPayload, Class<U> inputType, Class<V> ou
);
}
}

// Unsupported methods as these are not used by the CompactionScheduler / CompactSegments duty

@Override
public ListenableFuture<URI> findCurrentLeader()
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<TaskStatusResponse> taskStatus(String taskId)
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<TaskReport.ReportMap> taskReportAsMap(String taskId)
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<CloseableIterator<SupervisorStatus>> supervisorStatuses()
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<Integer> killPendingSegments(String dataSource, Interval interval)
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<List<IndexingWorkerInfo>> getWorkers()
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<CompactionStatusResponse> getCompactionSnapshots(@Nullable String dataSource)
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<CompactionProgressResponse> getBytesAwaitingCompaction(String dataSource)
{
throw new UnsupportedOperationException();
}

@Override
public ListenableFuture<Boolean> isCompactionSupervisorEnabled()
{
throw new UnsupportedOperationException();
}

@Override
public OverlordClient withRetryPolicy(ServiceRetryPolicy retryPolicy)
{
return this;
}
}
Loading
Loading