georgew5656 commented on code in PR #17545:
URL: https://github.com/apache/druid/pull/17545#discussion_r1889092387
##########
server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java:
##########
@@ -445,16 +448,14 @@ private void becomeLeader()
config.getCoordinatorPeriod()
)
);
- if (overlordClient != null) {
Review Comment:
why is it safe to remove this null check now? was it just unnecessary before?
##########
indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResource.java:
##########
@@ -0,0 +1,285 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.indexing.overlord.http;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import com.sun.jersey.spi.container.ResourceFilters;
+import org.apache.druid.audit.AuditEntry;
+import org.apache.druid.audit.AuditManager;
+import org.apache.druid.error.DruidException;
+import org.apache.druid.error.InvalidInput;
+import org.apache.druid.indexing.overlord.TaskMaster;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.java.util.common.logger.Logger;
+import org.apache.druid.metadata.SegmentsMetadataManager;
+import org.apache.druid.rpc.indexing.SegmentUpdateResponse;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.server.http.ServletResourceUtils;
+import org.apache.druid.server.http.security.DatasourceResourceFilter;
+import org.apache.druid.server.security.AuthorizationUtils;
+import org.apache.druid.timeline.SegmentId;
+import org.joda.time.Interval;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Datasource APIs exposed by the Overlord to update segments.
+ * Some of these APIs are also exposed by the Coordinator, but they have been
+ * deprecated and the Overlord APIs must be used for all update operations.
+ */
+@Path("/druid/indexer/v1/datasources")
+public class OverlordDataSourcesResource
+{
+ private static final Logger log = new
Logger(OverlordDataSourcesResource.class);
+
+ private final SegmentsMetadataManager segmentsMetadataManager;
+ private final TaskMaster taskMaster;
+ private final AuditManager auditManager;
+
+ @Inject
+ public OverlordDataSourcesResource(
+ TaskMaster taskMaster,
+ SegmentsMetadataManager segmentsMetadataManager,
+ AuditManager auditManager
+ )
+ {
+ this.taskMaster = taskMaster;
+ this.auditManager = auditManager;
+ this.segmentsMetadataManager = segmentsMetadataManager;
+ }
+
+ private interface SegmentUpdateOperation
+ {
+ int perform();
+ }
+
+ @POST
+ @Path("/{dataSourceName}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @ResourceFilters(DatasourceResourceFilter.class)
+ public Response markAllNonOvershadowedSegmentsAsUsed(
+ @PathParam("dataSourceName") final String dataSourceName,
+ @Context HttpServletRequest req
+ )
+ {
+ SegmentUpdateOperation operation = () -> segmentsMetadataManager
+ .markAsUsedAllNonOvershadowedSegmentsInDataSource(dataSourceName);
+ return performSegmentUpdate(dataSourceName, operation);
+ }
+
+ @DELETE
+ @Path("/{dataSourceName}")
+ @ResourceFilters(DatasourceResourceFilter.class)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response markAllSegmentsAsUnused(
+ @PathParam("dataSourceName") final String dataSourceName,
+ @Context HttpServletRequest req
+ )
+ {
+ SegmentUpdateOperation operation = () -> segmentsMetadataManager
+ .markAsUnusedAllSegmentsInDataSource(dataSourceName);
+ final Response response = performSegmentUpdate(dataSourceName, operation);
+
+ final int responseCode = response.getStatus();
+ if (responseCode >= 200 && responseCode < 300) {
+ auditMarkUnusedOperation(response.getEntity(), dataSourceName, req);
+ }
+
+ return response;
+ }
+
+ @POST
+ @Path("/{dataSourceName}/markUsed")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @ResourceFilters(DatasourceResourceFilter.class)
+ public Response markNonOvershadowedSegmentsAsUsed(
+ @PathParam("dataSourceName") final String dataSourceName,
+ final SegmentsToUpdateFilter payload
+ )
+ {
+ if (payload == null || !payload.isValid()) {
+ return Response
+ .status(Response.Status.BAD_REQUEST)
+ .entity(SegmentsToUpdateFilter.INVALID_PAYLOAD_ERROR_MESSAGE)
+ .build();
+ } else {
+ SegmentUpdateOperation operation = () -> {
+ final Interval interval = payload.getInterval();
+ final List<String> versions = payload.getVersions();
+ if (interval != null) {
+ return
segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(dataSourceName,
interval, versions);
+ } else {
+ final Set<String> segmentIds = payload.getSegmentIds();
+ if (segmentIds == null || segmentIds.isEmpty()) {
+ return 0;
+ }
+
+ // Validate segmentIds
+ final List<String> invalidSegmentIds = new ArrayList<>();
+ for (String segmentId : segmentIds) {
+ if
(SegmentId.iteratePossibleParsingsWithDataSource(dataSourceName,
segmentId).isEmpty()) {
+ invalidSegmentIds.add(segmentId);
+ }
+ }
+ if (!invalidSegmentIds.isEmpty()) {
+ throw InvalidInput.exception("Could not parse invalid segment
IDs[%s]", invalidSegmentIds);
+ }
+
+ return
segmentsMetadataManager.markAsUsedNonOvershadowedSegments(dataSourceName,
segmentIds);
+ }
+ };
+
+ return performSegmentUpdate(dataSourceName, operation);
+ }
+ }
+
+ @POST
+ @Path("/{dataSourceName}/markUnused")
+ @ResourceFilters(DatasourceResourceFilter.class)
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Response markSegmentsAsUnused(
+ @PathParam("dataSourceName") final String dataSourceName,
+ final SegmentsToUpdateFilter payload,
+ @Context final HttpServletRequest req
+ )
+ {
+ if (payload == null || !payload.isValid()) {
+ return Response
+ .status(Response.Status.BAD_REQUEST)
+ .entity(SegmentsToUpdateFilter.INVALID_PAYLOAD_ERROR_MESSAGE)
+ .build();
+ } else {
+ SegmentUpdateOperation operation = () -> {
+ final Interval interval = payload.getInterval();
+ final List<String> versions = payload.getVersions();
+ final int numUpdatedSegments;
+ if (interval != null) {
+ numUpdatedSegments =
segmentsMetadataManager.markAsUnusedSegmentsInInterval(dataSourceName,
interval, versions);
+ } else {
+ final Set<SegmentId> segmentIds = payload.getSegmentIds()
+ .stream()
+ .map(id ->
SegmentId.tryParse(dataSourceName, id))
+ .filter(Objects::nonNull)
+
.collect(Collectors.toSet());
+
+ // Filter out segmentIds that do not belong to this datasource
+ numUpdatedSegments = segmentsMetadataManager.markSegmentsAsUnused(
+ segmentIds.stream()
+ .filter(segmentId ->
segmentId.getDataSource().equals(dataSourceName))
+ .collect(Collectors.toSet())
+ );
+ }
+ auditMarkUnusedOperation(payload, dataSourceName, req);
+ return numUpdatedSegments;
Review Comment:
would it make sense to return the list of segmentIds updated instead? since
some of them get filtered out if the datasource doesn't match?
##########
server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java:
##########
@@ -628,6 +628,30 @@ private List<CompactSegments>
getCompactSegmentsDutyFromCustomGroups()
.collect(Collectors.toList());
}
+ /**
+ * Makes an API call to Overlord to mark segments of a datasource as unused.
+ *
+ * @return Number of segments updated.
+ */
+ private int markSegmentsAsUnused(String datasource, Set<SegmentId>
segmentIds)
+ {
+ try {
+ final Set<String> segmentIdsToUpdate
+ =
segmentIds.stream().map(SegmentId::toString).collect(Collectors.toSet());
+ final SegmentsToUpdateFilter filter
+ = new SegmentsToUpdateFilter(null, segmentIdsToUpdate, null);
+ SegmentUpdateResponse response = FutureUtils.getUnchecked(
+ overlordClient.markSegmentsAsUnused(datasource, filter),
Review Comment:
won't this short-circuit the fallback system for if the coordinator is
updated but the overlord isn't? since this directly tries to call the
overlord's new API from coordiantor duties instead of first hitting the
coordinator API and then redirecting to the overlord API?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
