Jackie-Jiang commented on code in PR #14920:
URL: https://github.com/apache/pinot/pull/14920#discussion_r1943877931
##########
pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java:
##########
@@ -170,6 +190,26 @@ public void completeSegmentsOperations(String
tableNameWithType, FileUploadType
processExistingSegments(tableNameWithType, uploadType,
enableParallelPushProtection, headers, existingSegmentsList);
}
+ public void updateReingestedSegmentZKMetadata(String tableNameWithType,
SegmentMetadata segmentMetadata,
Review Comment:
Not used?
##########
pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java:
##########
@@ -72,6 +72,17 @@ public void completeSegmentOperations(String
tableNameWithType, SegmentMetadata
@Nullable String sourceDownloadURIStr, String segmentDownloadURIStr,
@Nullable String crypterName,
long segmentSizeInBytes, boolean enableParallelPushProtection, boolean
allowRefresh, HttpHeaders headers)
throws Exception {
+ completeSegmentOperations(tableNameWithType, segmentMetadata, uploadType,
finalSegmentLocationURI, segmentFile,
Review Comment:
Let's not coupling the logic of reingestion into current regular segment
complete handling. Currently the logic is very hard to read, and we are
coupling reset with reingestion, which is not correct.
We can add a new method `completeReingestedSegmentOperations()`. Reingested
segment holds different assumptions then regular uploaded segment.
##########
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/writer/StatelessRealtimeSegmentWriter.java:
##########
@@ -0,0 +1,582 @@
+/**
+ * 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.pinot.segment.local.realtime.writer;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.utils.TarCompressionUtils;
+import org.apache.pinot.segment.local.indexsegment.mutable.MutableSegmentImpl;
+import org.apache.pinot.segment.local.io.writer.impl.MmapMemoryManager;
+import
org.apache.pinot.segment.local.realtime.converter.RealtimeSegmentConverter;
+import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentConfig;
+import
org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentStatsHistory;
+import org.apache.pinot.segment.local.segment.creator.TransformPipeline;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.utils.IngestionUtils;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
+import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
+import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
+import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
+import org.apache.pinot.spi.config.table.SegmentZKPropsConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.plugin.PluginManager;
+import org.apache.pinot.spi.stream.MessageBatch;
+import org.apache.pinot.spi.stream.PartitionGroupConsumer;
+import org.apache.pinot.spi.stream.PartitionGroupConsumptionStatus;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.stream.StreamConsumerFactory;
+import org.apache.pinot.spi.stream.StreamConsumerFactoryProvider;
+import org.apache.pinot.spi.stream.StreamDataDecoder;
+import org.apache.pinot.spi.stream.StreamDataDecoderImpl;
+import org.apache.pinot.spi.stream.StreamDataDecoderResult;
+import org.apache.pinot.spi.stream.StreamMessage;
+import org.apache.pinot.spi.stream.StreamMessageDecoder;
+import org.apache.pinot.spi.stream.StreamMetadataProvider;
+import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
+import org.apache.pinot.spi.stream.StreamPartitionMsgOffsetFactory;
+import org.apache.pinot.spi.utils.retry.RetryPolicies;
+import org.apache.pinot.spi.utils.retry.RetryPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Simplified Segment Data Manager for ingesting data from a start offset to
an end offset.
+ */
+public class StatelessRealtimeSegmentWriter {
+
+ private static final int DEFAULT_CAPACITY = 100_000;
+ private static final int DEFAULT_FETCH_TIMEOUT_MS = 5000;
+
+ private final Semaphore _segBuildSemaphore;
+ private final String _segmentName;
+ private final String _tableNameWithType;
+ private final int _partitionGroupId;
+ private final String _segmentNameStr;
+ private final SegmentZKMetadata _segmentZKMetadata;
+ private final TableConfig _tableConfig;
+ private final Schema _schema;
+ private final StreamConfig _streamConfig;
+ private final StreamPartitionMsgOffsetFactory _offsetFactory;
+ private final StreamConsumerFactory _consumerFactory;
+ private StreamMetadataProvider _partitionMetadataProvider;
+ private final PartitionGroupConsumer _consumer;
+ private final StreamDataDecoder _decoder;
+ private final MutableSegmentImpl _realtimeSegment;
+ private final File _resourceTmpDir;
+ private final File _resourceDataDir;
+ private final Logger _logger;
+ private Thread _consumerThread;
+ private final AtomicBoolean _shouldStop = new AtomicBoolean(false);
+ private final AtomicBoolean _isDoneConsuming = new AtomicBoolean(false);
+ private final StreamPartitionMsgOffset _startOffset;
+ private final StreamPartitionMsgOffset _endOffset;
+ private volatile StreamPartitionMsgOffset _currentOffset;
+ private final int _fetchTimeoutMs;
+ private final TransformPipeline _transformPipeline;
+ private volatile boolean _isSuccess = false;
+ private volatile Throwable _consumptionException;
+ private final ServerMetrics _serverMetrics;
+
+ public StatelessRealtimeSegmentWriter(String segmentName, String
tableNameWithType, int partitionGroupId,
Review Comment:
A lot of parameters are not needed and can be derived. Passing
`SegmentZKMetadata`, `IndexLoadingConfig`, `@Nullable Semaphore` should be
enough. We don't want to pass `ServerMetrics` because this can potentially run
in minion
##########
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/writer/StatelessRealtimeSegmentWriter.java:
##########
@@ -0,0 +1,582 @@
+/**
+ * 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.pinot.segment.local.realtime.writer;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.utils.TarCompressionUtils;
+import org.apache.pinot.segment.local.indexsegment.mutable.MutableSegmentImpl;
+import org.apache.pinot.segment.local.io.writer.impl.MmapMemoryManager;
+import
org.apache.pinot.segment.local.realtime.converter.RealtimeSegmentConverter;
+import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentConfig;
+import
org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentStatsHistory;
+import org.apache.pinot.segment.local.segment.creator.TransformPipeline;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.utils.IngestionUtils;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
+import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
+import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
+import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
+import org.apache.pinot.spi.config.table.SegmentZKPropsConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.plugin.PluginManager;
+import org.apache.pinot.spi.stream.MessageBatch;
+import org.apache.pinot.spi.stream.PartitionGroupConsumer;
+import org.apache.pinot.spi.stream.PartitionGroupConsumptionStatus;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.stream.StreamConsumerFactory;
+import org.apache.pinot.spi.stream.StreamConsumerFactoryProvider;
+import org.apache.pinot.spi.stream.StreamDataDecoder;
+import org.apache.pinot.spi.stream.StreamDataDecoderImpl;
+import org.apache.pinot.spi.stream.StreamDataDecoderResult;
+import org.apache.pinot.spi.stream.StreamMessage;
+import org.apache.pinot.spi.stream.StreamMessageDecoder;
+import org.apache.pinot.spi.stream.StreamMetadataProvider;
+import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
+import org.apache.pinot.spi.stream.StreamPartitionMsgOffsetFactory;
+import org.apache.pinot.spi.utils.retry.RetryPolicies;
+import org.apache.pinot.spi.utils.retry.RetryPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Simplified Segment Data Manager for ingesting data from a start offset to
an end offset.
+ */
+public class StatelessRealtimeSegmentWriter {
Review Comment:
Let's clean this up. A lot of fields are not required
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java:
##########
@@ -2096,6 +2103,146 @@ URI createSegmentPath(String rawTableName, String
segmentName) {
return URIUtils.getUri(_controllerConf.getDataDir(), rawTableName,
URIUtils.encode(segmentName));
}
+ /**
+ * Re-ingests segments that are in ERROR state in EV but ONLINE in IS with
no peer copy on any server. This method
+ * will call the server reIngestSegment API
+ * on one of the alive servers that are supposed to host that segment
according to IdealState.
+ *
+ * API signature:
+ * POST http://[serverURL]/reIngestSegment/[segmentName]
Review Comment:
```suggestion
* POST http://[serverURL]/reingestSegment/[segmentName]
```
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java:
##########
@@ -2096,6 +2103,146 @@ URI createSegmentPath(String rawTableName, String
segmentName) {
return URIUtils.getUri(_controllerConf.getDataDir(), rawTableName,
URIUtils.encode(segmentName));
}
+ /**
+ * Re-ingests segments that are in ERROR state in EV but ONLINE in IS with
no peer copy on any server. This method
+ * will call the server reIngestSegment API
+ * on one of the alive servers that are supposed to host that segment
according to IdealState.
+ *
+ * API signature:
+ * POST http://[serverURL]/reIngestSegment/[segmentName]
+ * Request body (JSON):
+ *
+ * @param realtimeTableName The table name with type, e.g. "myTable_REALTIME"
+ */
+ public void reIngestSegmentsWithErrorState(String realtimeTableName) {
Review Comment:
Keep the name consistent, same for other places
```suggestion
public void reingestSegmentsWithErrorState(String realtimeTableName) {
```
##########
pinot-server/src/main/java/org/apache/pinot/server/api/resources/ReIngestionResource.java:
##########
@@ -0,0 +1,361 @@
+/**
+ * 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.pinot.server.api.resources;
+
+import com.google.common.base.Function;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiKeyAuthDefinition;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.SecurityDefinition;
+import io.swagger.annotations.SwaggerDefinition;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.http.HttpClient;
+import org.apache.pinot.core.data.manager.InstanceDataManager;
+import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import
org.apache.pinot.segment.local.realtime.writer.StatelessRealtimeSegmentWriter;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.server.api.resources.reingestion.ReIngestionResponse;
+import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler;
+import org.apache.pinot.server.starter.ServerInstance;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.utils.IngestionConfigUtils;
+import org.apache.pinot.spi.utils.StringUtil;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.pinot.spi.utils.CommonConstants.DATABASE;
+import static
org.apache.pinot.spi.utils.CommonConstants.SWAGGER_AUTHORIZATION_KEY;
+
+
+@Api(tags = "ReIngestion", authorizations = {@Authorization(value =
SWAGGER_AUTHORIZATION_KEY),
+ @Authorization(value = DATABASE)})
+@SwaggerDefinition(securityDefinition =
@SecurityDefinition(apiKeyAuthDefinitions = {
+ @ApiKeyAuthDefinition(name = HttpHeaders.AUTHORIZATION, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER,
+ key = SWAGGER_AUTHORIZATION_KEY,
+ description = "The format of the key is ```\"Basic <token>\" or
\"Bearer <token>\"```"),
+ @ApiKeyAuthDefinition(name = DATABASE, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER, key = DATABASE,
+ description = "Database context passed through http header. If no
context is provided 'default' database "
+ + "context will be considered.")}))
+@Path("/")
+public class ReIngestionResource {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ReIngestionResource.class);
+
+ //TODO: Make this configurable
+ private static final int MIN_REINGESTION_THREADS = 4;
+ private static final int MAX_PARALLEL_REINGESTIONS = 8;
+
+ // Tracks if a particular segment is currently being re-ingested
+ private static final ConcurrentHashMap<String, AtomicBoolean>
Review Comment:
If the reingestion failed, this server will reject future reingestion
request. We need to remove the entry when the reingestion finishes
##########
pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerGauge.java:
##########
@@ -180,7 +180,10 @@ public enum ControllerGauge implements
AbstractMetrics.Gauge {
// segment when the partition is first detected).
COMMITTING_SEGMENT_SIZE("committingSegmentSize", false),
- TABLE_REBALANCE_IN_PROGRESS("tableRebalanceInProgress", false);
+ TABLE_REBALANCE_IN_PROGRESS("tableRebalanceInProgress", false),
+
+ // Number of in progress segment reingestion
+ SEGMENT_REINGESTION_IN_PROGRESS("segmentReingestionInProgress", true);
Review Comment:
This is a little bit confusing. It is not re-ingestion in progress, but
re-ingested segment upload in progress. Also it is attached to a async handler.
Does it give correct tracking in async handler?
##########
pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java:
##########
@@ -965,6 +972,41 @@ public Response revertReplaceSegments(
}
}
+ @POST
+ @ManagedAsync
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Path("segment/completeReingestion")
Review Comment:
Follow the existing format for path:
`/segments/reingested"`
##########
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/writer/StatelessRealtimeSegmentWriter.java:
##########
@@ -0,0 +1,582 @@
+/**
+ * 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.pinot.segment.local.realtime.writer;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.utils.TarCompressionUtils;
+import org.apache.pinot.segment.local.indexsegment.mutable.MutableSegmentImpl;
+import org.apache.pinot.segment.local.io.writer.impl.MmapMemoryManager;
+import
org.apache.pinot.segment.local.realtime.converter.RealtimeSegmentConverter;
+import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentConfig;
+import
org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentStatsHistory;
+import org.apache.pinot.segment.local.segment.creator.TransformPipeline;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.utils.IngestionUtils;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
+import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
+import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
+import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
+import org.apache.pinot.spi.config.table.SegmentZKPropsConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.plugin.PluginManager;
+import org.apache.pinot.spi.stream.MessageBatch;
+import org.apache.pinot.spi.stream.PartitionGroupConsumer;
+import org.apache.pinot.spi.stream.PartitionGroupConsumptionStatus;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.stream.StreamConsumerFactory;
+import org.apache.pinot.spi.stream.StreamConsumerFactoryProvider;
+import org.apache.pinot.spi.stream.StreamDataDecoder;
+import org.apache.pinot.spi.stream.StreamDataDecoderImpl;
+import org.apache.pinot.spi.stream.StreamDataDecoderResult;
+import org.apache.pinot.spi.stream.StreamMessage;
+import org.apache.pinot.spi.stream.StreamMessageDecoder;
+import org.apache.pinot.spi.stream.StreamMetadataProvider;
+import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
+import org.apache.pinot.spi.stream.StreamPartitionMsgOffsetFactory;
+import org.apache.pinot.spi.utils.retry.RetryPolicies;
+import org.apache.pinot.spi.utils.retry.RetryPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Simplified Segment Data Manager for ingesting data from a start offset to
an end offset.
+ */
+public class StatelessRealtimeSegmentWriter {
+
+ private static final int DEFAULT_CAPACITY = 100_000;
+ private static final int DEFAULT_FETCH_TIMEOUT_MS = 5000;
+
+ private final Semaphore _segBuildSemaphore;
+ private final String _segmentName;
+ private final String _tableNameWithType;
+ private final int _partitionGroupId;
+ private final String _segmentNameStr;
+ private final SegmentZKMetadata _segmentZKMetadata;
+ private final TableConfig _tableConfig;
+ private final Schema _schema;
+ private final StreamConfig _streamConfig;
+ private final StreamPartitionMsgOffsetFactory _offsetFactory;
+ private final StreamConsumerFactory _consumerFactory;
+ private StreamMetadataProvider _partitionMetadataProvider;
+ private final PartitionGroupConsumer _consumer;
+ private final StreamDataDecoder _decoder;
+ private final MutableSegmentImpl _realtimeSegment;
+ private final File _resourceTmpDir;
+ private final File _resourceDataDir;
+ private final Logger _logger;
+ private Thread _consumerThread;
+ private final AtomicBoolean _shouldStop = new AtomicBoolean(false);
+ private final AtomicBoolean _isDoneConsuming = new AtomicBoolean(false);
+ private final StreamPartitionMsgOffset _startOffset;
+ private final StreamPartitionMsgOffset _endOffset;
+ private volatile StreamPartitionMsgOffset _currentOffset;
+ private final int _fetchTimeoutMs;
+ private final TransformPipeline _transformPipeline;
+ private volatile boolean _isSuccess = false;
+ private volatile Throwable _consumptionException;
+ private final ServerMetrics _serverMetrics;
+
+ public StatelessRealtimeSegmentWriter(String segmentName, String
tableNameWithType, int partitionGroupId,
+ SegmentZKMetadata segmentZKMetadata, TableConfig tableConfig, Schema
schema,
+ IndexLoadingConfig indexLoadingConfig, StreamConfig streamConfig, String
startOffsetStr, String endOffsetStr,
+ Semaphore segBuildSemaphore, ServerMetrics serverMetrics)
+ throws Exception {
+ _segBuildSemaphore = segBuildSemaphore;
+ _segmentName = segmentName;
+ _tableNameWithType = tableNameWithType;
+ _partitionGroupId = partitionGroupId;
+ _segmentZKMetadata = segmentZKMetadata;
+ _tableConfig = tableConfig;
+ _schema = schema;
+ _streamConfig = streamConfig;
+ _resourceTmpDir = new File(FileUtils.getTempDirectory(), "resourceTmpDir_"
+ System.currentTimeMillis());
Review Comment:
I think we should pass in a data dir as the working dir. It might not always
work to use temp dir
##########
pinot-server/src/main/java/org/apache/pinot/server/api/resources/ReIngestionResource.java:
##########
@@ -0,0 +1,361 @@
+/**
+ * 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.pinot.server.api.resources;
+
+import com.google.common.base.Function;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiKeyAuthDefinition;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.SecurityDefinition;
+import io.swagger.annotations.SwaggerDefinition;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.http.HttpClient;
+import org.apache.pinot.core.data.manager.InstanceDataManager;
+import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import
org.apache.pinot.segment.local.realtime.writer.StatelessRealtimeSegmentWriter;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.server.api.resources.reingestion.ReIngestionResponse;
+import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler;
+import org.apache.pinot.server.starter.ServerInstance;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.utils.IngestionConfigUtils;
+import org.apache.pinot.spi.utils.StringUtil;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.pinot.spi.utils.CommonConstants.DATABASE;
+import static
org.apache.pinot.spi.utils.CommonConstants.SWAGGER_AUTHORIZATION_KEY;
+
+
+@Api(tags = "ReIngestion", authorizations = {@Authorization(value =
SWAGGER_AUTHORIZATION_KEY),
+ @Authorization(value = DATABASE)})
+@SwaggerDefinition(securityDefinition =
@SecurityDefinition(apiKeyAuthDefinitions = {
+ @ApiKeyAuthDefinition(name = HttpHeaders.AUTHORIZATION, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER,
+ key = SWAGGER_AUTHORIZATION_KEY,
+ description = "The format of the key is ```\"Basic <token>\" or
\"Bearer <token>\"```"),
+ @ApiKeyAuthDefinition(name = DATABASE, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER, key = DATABASE,
+ description = "Database context passed through http header. If no
context is provided 'default' database "
+ + "context will be considered.")}))
+@Path("/")
+public class ReIngestionResource {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ReIngestionResource.class);
+
+ //TODO: Make this configurable
+ private static final int MIN_REINGESTION_THREADS = 4;
+ private static final int MAX_PARALLEL_REINGESTIONS = 8;
Review Comment:
Let's use `max(nCPUs / 4, 1)` as the default
##########
pinot-server/src/main/java/org/apache/pinot/server/api/resources/ReIngestionResource.java:
##########
@@ -0,0 +1,361 @@
+/**
+ * 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.pinot.server.api.resources;
+
+import com.google.common.base.Function;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiKeyAuthDefinition;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.SecurityDefinition;
+import io.swagger.annotations.SwaggerDefinition;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.http.HttpClient;
+import org.apache.pinot.core.data.manager.InstanceDataManager;
+import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import
org.apache.pinot.segment.local.realtime.writer.StatelessRealtimeSegmentWriter;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.server.api.resources.reingestion.ReIngestionResponse;
+import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler;
+import org.apache.pinot.server.starter.ServerInstance;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.utils.IngestionConfigUtils;
+import org.apache.pinot.spi.utils.StringUtil;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.pinot.spi.utils.CommonConstants.DATABASE;
+import static
org.apache.pinot.spi.utils.CommonConstants.SWAGGER_AUTHORIZATION_KEY;
+
+
+@Api(tags = "ReIngestion", authorizations = {@Authorization(value =
SWAGGER_AUTHORIZATION_KEY),
+ @Authorization(value = DATABASE)})
+@SwaggerDefinition(securityDefinition =
@SecurityDefinition(apiKeyAuthDefinitions = {
+ @ApiKeyAuthDefinition(name = HttpHeaders.AUTHORIZATION, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER,
+ key = SWAGGER_AUTHORIZATION_KEY,
+ description = "The format of the key is ```\"Basic <token>\" or
\"Bearer <token>\"```"),
+ @ApiKeyAuthDefinition(name = DATABASE, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER, key = DATABASE,
+ description = "Database context passed through http header. If no
context is provided 'default' database "
+ + "context will be considered.")}))
+@Path("/")
+public class ReIngestionResource {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ReIngestionResource.class);
+
+ //TODO: Make this configurable
+ private static final int MIN_REINGESTION_THREADS = 4;
+ private static final int MAX_PARALLEL_REINGESTIONS = 8;
+
+ // Tracks if a particular segment is currently being re-ingested
+ private static final ConcurrentHashMap<String, AtomicBoolean>
+ SEGMENT_INGESTION_MAP = new ConcurrentHashMap<>();
+
+ // Executor for asynchronous re-ingestion
+ private static final ExecutorService REINGESTION_EXECUTOR =
+ new ThreadPoolExecutor(MIN_REINGESTION_THREADS,
MAX_PARALLEL_REINGESTIONS, 0L, TimeUnit.MILLISECONDS,
Review Comment:
We usually use `Executors.newFixedThreadPool()` to bound the thread usage.
Any benefit of manually constructing the `ThreadPoolExecutor`?
##########
pinot-server/src/main/java/org/apache/pinot/server/api/resources/ReIngestionResource.java:
##########
@@ -0,0 +1,361 @@
+/**
+ * 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.pinot.server.api.resources;
+
+import com.google.common.base.Function;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiKeyAuthDefinition;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.SecurityDefinition;
+import io.swagger.annotations.SwaggerDefinition;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.http.HttpClient;
+import org.apache.pinot.core.data.manager.InstanceDataManager;
+import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import
org.apache.pinot.segment.local.realtime.writer.StatelessRealtimeSegmentWriter;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.server.api.resources.reingestion.ReIngestionResponse;
+import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler;
+import org.apache.pinot.server.starter.ServerInstance;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.utils.IngestionConfigUtils;
+import org.apache.pinot.spi.utils.StringUtil;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.pinot.spi.utils.CommonConstants.DATABASE;
+import static
org.apache.pinot.spi.utils.CommonConstants.SWAGGER_AUTHORIZATION_KEY;
+
+
+@Api(tags = "ReIngestion", authorizations = {@Authorization(value =
SWAGGER_AUTHORIZATION_KEY),
+ @Authorization(value = DATABASE)})
+@SwaggerDefinition(securityDefinition =
@SecurityDefinition(apiKeyAuthDefinitions = {
+ @ApiKeyAuthDefinition(name = HttpHeaders.AUTHORIZATION, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER,
+ key = SWAGGER_AUTHORIZATION_KEY,
+ description = "The format of the key is ```\"Basic <token>\" or
\"Bearer <token>\"```"),
+ @ApiKeyAuthDefinition(name = DATABASE, in =
ApiKeyAuthDefinition.ApiKeyLocation.HEADER, key = DATABASE,
+ description = "Database context passed through http header. If no
context is provided 'default' database "
+ + "context will be considered.")}))
+@Path("/")
+public class ReIngestionResource {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ReIngestionResource.class);
+
+ //TODO: Make this configurable
+ private static final int MIN_REINGESTION_THREADS = 4;
+ private static final int MAX_PARALLEL_REINGESTIONS = 8;
+
+ // Tracks if a particular segment is currently being re-ingested
+ private static final ConcurrentHashMap<String, AtomicBoolean>
+ SEGMENT_INGESTION_MAP = new ConcurrentHashMap<>();
+
+ // Executor for asynchronous re-ingestion
+ private static final ExecutorService REINGESTION_EXECUTOR =
+ new ThreadPoolExecutor(MIN_REINGESTION_THREADS,
MAX_PARALLEL_REINGESTIONS, 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<>(), // unbounded queue for the reingestion
tasks
+ new
ThreadFactoryBuilder().setNameFormat("reingestion-worker-%d").build());
+
+ // Keep track of jobs by jobId => job info
+ private static final ConcurrentHashMap<String, ReIngestionJob> RUNNING_JOBS
= new ConcurrentHashMap<>();
+ public static final long CONSUMPTION_END_TIMEOUT_MS =
Duration.ofMinutes(30).toMillis();
+ public static final long UPLOAD_END_TIMEOUT_MS =
Duration.ofMinutes(5).toMillis();
+ public static final long CHECK_INTERVAL_MS =
Duration.ofSeconds(5).toMillis();
+
+ @Inject
+ private ServerInstance _serverInstance;
+
+ /**
+ * Simple data class to hold job details.
+ */
+ private static class ReIngestionJob {
+ private final String _jobId;
+ private final String _tableNameWithType;
+ private final String _segmentName;
+ private final long _startTimeMs;
+
+ ReIngestionJob(String jobId, String tableNameWithType, String segmentName)
{
+ _jobId = jobId;
+ _tableNameWithType = tableNameWithType;
+ _segmentName = segmentName;
+ _startTimeMs = System.currentTimeMillis();
+ }
+
+ public String getJobId() {
+ return _jobId;
+ }
+
+ public String getTableNameWithType() {
+ return _tableNameWithType;
+ }
+
+ public String getSegmentName() {
+ return _segmentName;
+ }
+
+ public long getStartTimeMs() {
+ return _startTimeMs;
+ }
+ }
+
+ /**
+ * New API to get all running re-ingestion jobs.
+ */
+ @GET
+ @Path("/reingestSegment/jobs")
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation("Get all running re-ingestion jobs along with job IDs")
+ public Response getAllRunningReingestionJobs() {
+ // Filter only the jobs still marked as running
+ List<ReIngestionJob> runningJobs = new ArrayList<>(RUNNING_JOBS.values());
+ return Response.ok(runningJobs).build();
+ }
+
+ @POST
+ @Path("/reingestSegment/{segmentName}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Re-ingest segment asynchronously", notes = "Returns a
jobId immediately; ingestion runs in "
+ + "background.")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Success", response =
ReIngestionResponse.class),
+ @ApiResponse(code = 500, message = "Internal server error", response =
ErrorInfo.class)
+ })
+ public Response reIngestSegment(@PathParam("segmentName") String
segmentName) {
+ // if segment is not in LLC format, return error
+ if (!LLCSegmentName.isLLCSegment(segmentName)) {
+ throw new WebApplicationException("Segment name is not in LLC format: "
+ segmentName,
+ Response.Status.BAD_REQUEST);
+ }
+ LLCSegmentName llcSegmentName = new LLCSegmentName(segmentName);
+ String tableNameWithType =
TableNameBuilder.REALTIME.tableNameWithType(llcSegmentName.getTableName());
+
+ InstanceDataManager instanceDataManager =
_serverInstance.getInstanceDataManager();
+ if (instanceDataManager == null) {
+ throw new WebApplicationException("Invalid server initialization",
Response.Status.INTERNAL_SERVER_ERROR);
+ }
+
+ RealtimeTableDataManager tableDataManager =
+ (RealtimeTableDataManager)
instanceDataManager.getTableDataManager(tableNameWithType);
+ if (tableDataManager == null) {
+ throw new WebApplicationException("Table data manager not found for
table: " + tableNameWithType,
+ Response.Status.NOT_FOUND);
+ }
+
+ IndexLoadingConfig indexLoadingConfig =
tableDataManager.fetchIndexLoadingConfig();
+ LOGGER.info("Executing re-ingestion for table: {}, segment: {}",
tableNameWithType, segmentName);
+
+ // Get TableConfig, Schema, ZK metadata
+ TableConfig tableConfig = indexLoadingConfig.getTableConfig();
+ if (tableConfig == null) {
+ throw new WebApplicationException("Table config not found for table: " +
tableNameWithType,
+ Response.Status.NOT_FOUND);
+ }
+ Schema schema = indexLoadingConfig.getSchema();
+ if (schema == null) {
+ throw new WebApplicationException("Schema not found for table: " +
tableNameWithType,
+ Response.Status.NOT_FOUND);
+ }
+
+ SegmentZKMetadata segmentZKMetadata =
tableDataManager.fetchZKMetadata(segmentName);
+ if (segmentZKMetadata == null) {
+ throw new WebApplicationException("Segment metadata not found for
segment: " + segmentName,
+ Response.Status.NOT_FOUND);
+ }
+
+ // Check if download url is present
+ if (segmentZKMetadata.getDownloadUrl() != null) {
+ throw new WebApplicationException(
+ "Download URL is already present for segment: " + segmentName + ".
No need to re-ingest.",
+ Response.Status.BAD_REQUEST);
+ }
+
+ // Grab start/end offsets
+ String startOffsetStr = segmentZKMetadata.getStartOffset();
+ String endOffsetStr = segmentZKMetadata.getEndOffset();
+ if (startOffsetStr == null || endOffsetStr == null) {
+ throw new WebApplicationException("Null start/end offset for segment: "
+ segmentName,
+ Response.Status.INTERNAL_SERVER_ERROR);
+ }
+
+ // Check if this segment is already being re-ingested
+ AtomicBoolean isIngesting =
SEGMENT_INGESTION_MAP.computeIfAbsent(segmentName, k -> new
AtomicBoolean(false));
+ if (!isIngesting.compareAndSet(false, true)) {
+ return Response.status(Response.Status.CONFLICT)
+ .entity("Re-ingestion for segment: " + segmentName + " is already in
progress.")
+ .build();
+ }
+
+ // Generate a jobId for tracking
+ String jobId = UUID.randomUUID().toString();
+ ReIngestionJob job = new ReIngestionJob(jobId, tableNameWithType,
segmentName);
+
+ // Kick off the actual work asynchronously
+ REINGESTION_EXECUTOR.submit(() -> {
+ try {
+ int partitionGroupId = llcSegmentName.getPartitionGroupId();
+
+ Map<String, String> streamConfigMap =
IngestionConfigUtils.getStreamConfigMaps(tableConfig).get(0);
Review Comment:
Is there a way to know which stream config to use to generate the segment?
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java:
##########
@@ -2096,6 +2104,131 @@ URI createSegmentPath(String rawTableName, String
segmentName) {
return URIUtils.getUri(_controllerConf.getDataDir(), rawTableName,
URIUtils.encode(segmentName));
}
+ /**
+ * Re-ingests segments that are in ERROR state in EV but ONLINE in IS with
no peer copy on any server. This method
+ * will call the server reIngestSegment API
+ * on one of the alive servers that are supposed to host that segment
according to IdealState.
+ *
+ * API signature:
+ * POST http://[serverURL]/reIngestSegment
+ * Request body (JSON):
+ * {
+ * "tableNameWithType": [tableName],
+ * "segmentName": [segmentName]
+ * }
+ *
+ * @param tableNameWithType The table name with type, e.g. "myTable_REALTIME"
+ */
+ public void reIngestSegmentsWithErrorState(String tableNameWithType) {
+ // Step 1: Fetch the ExternalView and all segments
+ ExternalView externalView = getExternalView(tableNameWithType);
+ IdealState idealState = getIdealState(tableNameWithType);
+ Map<String, Map<String, String>> segmentToInstanceCurrentStateMap =
externalView.getRecord().getMapFields();
+ Map<String, Map<String, String>> segmentToInstanceIdealStateMap =
idealState.getRecord().getMapFields();
+
+ // find segments in ERROR state in externalView
+ List<String> segmentsInErrorState = new ArrayList<>();
+ for (Map.Entry<String, Map<String, String>> entry :
segmentToInstanceCurrentStateMap.entrySet()) {
+ String segmentName = entry.getKey();
+ Map<String, String> instanceStateMap = entry.getValue();
+ boolean allReplicasInError = true;
Review Comment:
Can we pull that logic out and handle it differently for pauseless table?
For pauseless table, reset doesn't really work. Also that shouldn't be segment
level validation.
--
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: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
