Skip to content

Support consuming tier overrides for realtime consuming segments #18474

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

Closed
xiangfu0 wants to merge 1 commit into from
Closed

Support consuming tier overrides for realtime consuming segments #18474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ public enum ServerMeter implements AbstractMetrics.Meter {
SEGMENT_DOWNLOAD_FROM_REMOTE_FAILURES("segments", false),
SEGMENT_DOWNLOAD_FROM_PEERS_FAILURES("segments", false),
SEGMENT_BUILD_FAILURE("segments", false),
/// Counts consuming-segment-build events where `realtimeConfig.consumingSegmentIndexConfig` could not be applied
/// and the server fell back to the persisted segment shape. Emitted per table.
CONSUMING_SEGMENT_INDEX_PROFILE_FALLBACK("events", false),
SEGMENT_UPLOAD_FAILURE("segments", false),
SEGMENT_UPLOAD_SUCCESS("segments", false),
// Emitted only by Server to Deep-store segment uploader.
Expand Down
13 changes: 12 additions & 1 deletion pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigSerDeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.pinot.spi.config.table.IndexingConfig;
import org.apache.pinot.spi.config.table.QueryConfig;
import org.apache.pinot.spi.config.table.QuotaConfig;
import org.apache.pinot.spi.config.table.RealtimeConfig;
import org.apache.pinot.spi.config.table.RoutingConfig;
import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
import org.apache.pinot.spi.config.table.TableConfig;
Expand Down Expand Up @@ -112,6 +113,12 @@ public static TableConfig fromZNRecord(ZNRecord znRecord)
queryConfig = JsonUtils.stringToObject(queryConfigString, QueryConfig.class);
}

RealtimeConfig realtimeConfig = null;
String realtimeConfigString = simpleFields.get(TableConfig.REALTIME_CONFIG_KEY);
if (realtimeConfigString != null) {
realtimeConfig = JsonUtils.stringToObject(realtimeConfigString, RealtimeConfig.class);
}

Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = null;
String instanceAssignmentConfigMapString = simpleFields.get(TableConfig.INSTANCE_ASSIGNMENT_CONFIG_MAP_KEY);
if (instanceAssignmentConfigMapString != null) {
Expand Down Expand Up @@ -198,7 +205,7 @@ public static TableConfig fromZNRecord(ZNRecord znRecord)
new TableConfig(tableName, tableType, validationConfig, tenantConfig, indexingConfig, customConfig,
quotaConfig, taskConfig, routingConfig, queryConfig, instanceAssignmentConfigMap, fieldConfigList,
upsertConfig, dedupConfig, dimensionTableConfig, ingestionConfig, tierConfigList, isDimTable,
tunerConfigList, instancePartitionsMap, segmentAssignmentConfigMap, tableSamplerConfigs);
tunerConfigList, instancePartitionsMap, segmentAssignmentConfigMap, tableSamplerConfigs, realtimeConfig);
tableConfig.setDescription(description);
tableConfig.setTags(tags);
return tableConfig;
Expand Down Expand Up @@ -234,6 +241,10 @@ public static ZNRecord toZNRecord(TableConfig tableConfig)
if (queryConfig != null) {
simpleFields.put(TableConfig.QUERY_CONFIG_KEY, queryConfig.toJsonString());
}
RealtimeConfig realtimeConfig = tableConfig.getRealtimeConfig();
if (realtimeConfig != null) {
simpleFields.put(TableConfig.REALTIME_CONFIG_KEY, realtimeConfig.toJsonString());
}
Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
if (instanceAssignmentConfigMap != null) {
simpleFields.put(TableConfig.INSTANCE_ASSIGNMENT_CONFIG_MAP_KEY,
Expand Down
43 changes: 43 additions & 0 deletions ...-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@
import java.util.Map;
import org.apache.pinot.common.tier.TierFactory;
import org.apache.pinot.spi.config.table.CompletionConfig;
import org.apache.pinot.spi.config.table.ConsumingSegmentFieldConfig;
import org.apache.pinot.spi.config.table.ConsumingSegmentIndexConfig;
import org.apache.pinot.spi.config.table.DedupConfig;
import org.apache.pinot.spi.config.table.FieldConfig;
import org.apache.pinot.spi.config.table.HashFunction;
import org.apache.pinot.spi.config.table.QueryConfig;
import org.apache.pinot.spi.config.table.QuotaConfig;
import org.apache.pinot.spi.config.table.RealtimeConfig;
import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig;
import org.apache.pinot.spi.config.table.RoutingConfig;
import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
Expand Down Expand Up @@ -214,6 +217,28 @@ public void testSerDe()
assertEquals(tableConfigToCompare, tableConfig);
checkQueryConfig(tableConfigToCompare);
}
{
// With realtime config
ObjectNode indexes = JsonUtils.newObjectNode();
indexes.set("inverted", JsonUtils.newObjectNode().put("enabled", true));
RealtimeConfig realtimeConfig = new RealtimeConfig(new ConsumingSegmentIndexConfig(List.of(
new ConsumingSegmentFieldConfig("column1", FieldConfig.EncodingType.DICTIONARY, indexes))));
TableConfig tableConfig = new TableConfigBuilder(TableType.REALTIME)
.setTableName("testRealtimeTable")
.setRealtimeConfig(realtimeConfig)
.build();

checkRealtimeConfig(tableConfig);

// Serialize then de-serialize
TableConfig tableConfigToCompare = JsonUtils.stringToObject(tableConfig.toJsonString(), TableConfig.class);
assertEquals(tableConfigToCompare, tableConfig);
checkRealtimeConfig(tableConfigToCompare);

tableConfigToCompare = TableConfigSerDeUtils.fromZNRecord(TableConfigSerDeUtils.toZNRecord(tableConfig));
assertEquals(tableConfigToCompare, tableConfig);
checkRealtimeConfig(tableConfigToCompare);
}
{
// With instance assignment config
InstanceAssignmentConfig instanceAssignmentConfig =
Expand Down Expand Up @@ -410,6 +435,7 @@ private void checkDefaultTableConfig(TableConfig tableConfig) {
assertFalse(tableConfigJson.has(TableConfig.TASK_CONFIG_KEY));
assertFalse(tableConfigJson.has(TableConfig.ROUTING_CONFIG_KEY));
assertFalse(tableConfigJson.has(TableConfig.QUERY_CONFIG_KEY));
assertFalse(tableConfigJson.has(TableConfig.REALTIME_CONFIG_KEY));
assertFalse(tableConfigJson.has(TableConfig.INSTANCE_ASSIGNMENT_CONFIG_MAP_KEY));
assertFalse(tableConfigJson.has(TableConfig.SEGMENT_ASSIGNMENT_CONFIG_MAP_KEY));
assertFalse(tableConfigJson.has(TableConfig.FIELD_CONFIG_LIST_KEY));
Expand All @@ -430,6 +456,23 @@ private void checkTenantConfigWithoutTagOverride(TableConfig tableConfig) {
assertNull(tenantConfig.getTagOverrideConfig());
}

private void checkRealtimeConfig(TableConfig tableConfig) {
RealtimeConfig realtimeConfig = tableConfig.getRealtimeConfig();
assertNotNull(realtimeConfig);
ConsumingSegmentIndexConfig consumingSegmentIndexConfig = realtimeConfig.getConsumingSegmentIndexConfig();
assertNotNull(consumingSegmentIndexConfig);
List<ConsumingSegmentFieldConfig> fieldConfigList = consumingSegmentIndexConfig.getFieldConfigList();
assertNotNull(fieldConfigList);
assertEquals(fieldConfigList.size(), 1);
ConsumingSegmentFieldConfig fieldConfig = fieldConfigList.get(0);
assertEquals(fieldConfig.getName(), "column1");
assertEquals(fieldConfig.getEncodingType(), FieldConfig.EncodingType.DICTIONARY);
assertTrue(fieldConfig.getIndexes().has("inverted"));

ObjectNode tableConfigJson = (ObjectNode) tableConfig.toJsonNode();
assertTrue(tableConfigJson.has(TableConfig.REALTIME_CONFIG_KEY));
}

private void checkTenantConfigWithTagOverride(TableConfig tableConfig) {
TenantConfig tenantConfig = tableConfig.getTenantConfig();
assertNotNull(tenantConfig);
Expand Down
10 changes: 8 additions & 2 deletions ...src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
import org.apache.pinot.segment.local.upsert.PartitionUpsertMetadataManager;
import org.apache.pinot.segment.local.upsert.UpsertContext;
import org.apache.pinot.segment.local.utils.IngestionUtils;
import org.apache.pinot.segment.local.utils.TableConfigUtils;
import org.apache.pinot.segment.spi.MutableSegment;
import org.apache.pinot.segment.spi.V1Constants;
import org.apache.pinot.segment.spi.creator.SegmentVersion;
Expand Down Expand Up @@ -1821,9 +1822,14 @@ public RealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableConf
_isOffHeap = indexLoadingConfig.isRealtimeOffHeapAllocation();
_defaultNullHandlingEnabled = indexingConfig.isNullHandlingEnabled();

// Start new realtime segment
// Start new realtime segment. The dispatch helper keeps the existing IndexLoadingConfig-driven path when no
// consuming segment index profile is configured, and builds a mutable-only profile view when one is configured.
String consumerDir = realtimeTableDataManager.getConsumerDir();
RealtimeSegmentConfig.Builder realtimeSegmentConfigBuilder = new RealtimeSegmentConfig.Builder(indexLoadingConfig)
RealtimeSegmentConfig.Builder realtimeSegmentConfigBuilder =
TableConfigUtils.buildConsumingSegmentConfigBuilder(_tableConfig, _schema, indexLoadingConfig, _segmentLogger,
() -> _serverMetrics.addMeteredTableValue(_tableNameWithType,
ServerMeter.CONSUMING_SEGMENT_INDEX_PROFILE_FALLBACK, 1L));
realtimeSegmentConfigBuilder
.setTableNameWithType(_tableNameWithType)
.setSegmentName(_segmentNameStr)
.setStreamName(streamTopic)
Expand Down
Loading
Loading