Jackie-Jiang commented on code in PR #15257:
URL: https://github.com/apache/pinot/pull/15257#discussion_r2006015698
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java:
##########
@@ -136,10 +150,22 @@ private void manageRetentionForTable(TableConfig
tableConfig) {
if (TableNameBuilder.isOfflineTableResource(tableNameWithType)) {
manageRetentionForOfflineTable(tableNameWithType, retentionStrategy,
untrackedSegmentsDeletionBatchSize);
} else {
- manageRetentionForRealtimeTable(tableNameWithType, retentionStrategy,
untrackedSegmentsDeletionBatchSize);
+ String rawTableName =
TableNameBuilder.extractRawTableName(tableNameWithType);
+ TableConfig offlineTableConfig =
_pinotHelixResourceManager.getOfflineTableConfig(rawTableName);
+ // hybrid table check should be performed before the realtime table
check.
+ if (_isHybridTableRetentionStrategyEnabled && isHybridTable(tableConfig,
offlineTableConfig)) {
Review Comment:
(minor) Can reduce one ZK lookup
```suggestion
TableConfig offlineTableConfig;
// hybrid table check should be performed before the realtime table
check.
if (_isHybridTableRetentionStrategyEnabled && (offlineTableConfig =
_pinotHelixResourceManager.getOfflineTableConfig(rawTableName)) != null) {
```
##########
pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerGauge.java:
##########
@@ -194,7 +194,8 @@ public enum ControllerGauge implements
AbstractMetrics.Gauge {
// The number of segments in deepstore that do not have corresponding
metadata in ZooKeeper.
// These segments are untracked and should be considered for deletion based
on retention policies.
- UNTRACKED_SEGMENTS_COUNT("untrackedSegmentsCount", false);
+ UNTRACKED_SEGMENTS_COUNT("untrackedSegmentsCount", false),
+ RETENTION_MANAGER_ERROR("retentionManagerError", false);
Review Comment:
(minor) Add some javadoc for this
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java:
##########
@@ -199,6 +225,70 @@ private void manageRetentionForRealtimeTable(String
realtimeTableName, Retention
}
}
+ @VisibleForTesting
+ void manageRetentionForHybridTable(TableConfig realtimeTableConfig,
TableConfig offlineTableConfig) {
+ LOGGER.info("Managing retention for hybrid table: {}",
realtimeTableConfig.getTableName());
+ List<String> segmentsToDelete = new ArrayList<>();
+ String realtimeTableName = realtimeTableConfig.getTableName();
+ String rawTableName =
TableNameBuilder.extractRawTableName(realtimeTableName);
+ String offlineTableName =
TableNameBuilder.OFFLINE.tableNameWithType(rawTableName);
+ try {
+ ZkHelixPropertyStore<ZNRecord> propertyStore =
_pinotHelixResourceManager.getPropertyStore();
+ Schema schema = ZKMetadataProvider.getTableSchema(propertyStore,
offlineTableName);
+ if (schema == null) {
+ throw new RuntimeException("Failed to get schema for table: " +
offlineTableName);
+ }
+ String timeColumn = null;
+ SegmentsValidationAndRetentionConfig validationConfig =
offlineTableConfig.getValidationConfig();
+ if (validationConfig != null) {
+ timeColumn = validationConfig.getTimeColumnName();
+ }
+ if (StringUtils.isEmpty(timeColumn)) {
+ throw new RuntimeException("TimeColumn is null or empty for table: " +
offlineTableName);
+ }
+ DateTimeFieldSpec dateTimeSpec = schema.getSpecForTimeColumn(timeColumn);
+ if (dateTimeSpec == null) {
+ throw new RuntimeException(String.format("Failed to get
DateTimeFieldSpec for time column: %s of table: %s",
+ timeColumn, offlineTableName));
+ }
+ DateTimeFormatSpec timeFormatSpec = dateTimeSpec.getFormatSpec();
+ if (timeFormatSpec.getColumnUnit() == null) {
Review Comment:
This shouldn't be needed. In fact it can break use cases with
`SIMPLE_DATE_FORMAT`
##########
pinot-controller/src/main/java/org/apache/pinot/controller/util/BrokerServiceHelper.java:
##########
@@ -0,0 +1,116 @@
+/**
+ * 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.controller.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.core.routing.TimeBoundaryInfo;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Helper class for interacting with broker APIs.
+ */
+public class BrokerServiceHelper {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(BrokerServiceHelper.class);
+ private static final String TIME_BOUNDARY_INFO_API_PATH =
"/debug/timeBoundary/%s";
+ private static final int DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
+ private final PinotHelixResourceManager _pinotHelixResourceManager;
+ private final ControllerConf _controllerConf;
+ private final Executor _executorService;
+ private final PoolingHttpClientConnectionManager _connectionManager;
+ private CompletionServiceHelper _completionServiceHelper;
Review Comment:
Is this safe to be cached and shared? I think we need to recompute the
endpoint map every time
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java:
##########
@@ -199,6 +225,70 @@ private void manageRetentionForRealtimeTable(String
realtimeTableName, Retention
}
}
+ @VisibleForTesting
+ void manageRetentionForHybridTable(TableConfig realtimeTableConfig,
TableConfig offlineTableConfig) {
+ LOGGER.info("Managing retention for hybrid table: {}",
realtimeTableConfig.getTableName());
+ List<String> segmentsToDelete = new ArrayList<>();
+ String realtimeTableName = realtimeTableConfig.getTableName();
+ String rawTableName =
TableNameBuilder.extractRawTableName(realtimeTableName);
+ String offlineTableName =
TableNameBuilder.OFFLINE.tableNameWithType(rawTableName);
+ try {
+ ZkHelixPropertyStore<ZNRecord> propertyStore =
_pinotHelixResourceManager.getPropertyStore();
+ Schema schema = ZKMetadataProvider.getTableSchema(propertyStore,
offlineTableName);
+ if (schema == null) {
+ throw new RuntimeException("Failed to get schema for table: " +
offlineTableName);
Review Comment:
(minor) We usually throw `IllegalStateException`. You may use
`Preconditions.checkState()` for concise. Same for other places
--
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
