Skip to content

Do not use autopartition settings when autopartitioning was disabled … #9185

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

Merged
nshestakov merged 1 commit into from
Sep 13, 2024
Merged

Do not use autopartition settings when autopartitioning was disabled … #9185

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
8 changes: 6 additions & 2 deletions ydb/services/lib/actors/pq_schema_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,12 @@ namespace NKikimr::NGRpcProxy::V1 {
}

std::optional<TYdbPqCodes> ValidatePartitionStrategy(const ::NKikimrPQ::TPQTabletConfig& config, TString& error) {
if (!config.has_partitionstrategy())
if (!config.HasPartitionStrategy()) {
return std::nullopt;
}
if (::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED == config.GetPartitionStrategy().GetPartitionStrategyType()) {
return std::nullopt;
}
auto strategy = config.GetPartitionStrategy();
if (strategy.GetMinPartitionCount() < 0) {
error = TStringBuilder() << "Partitions count must be non-negative, provided " << strategy.GetMinPartitionCount();
Expand All @@ -713,7 +717,7 @@ namespace NKikimr::NGRpcProxy::V1 {
error = TStringBuilder() << "Partition scale threshold time must be greater then 1 second, provided " << strategy.GetScaleThresholdSeconds() << " seconds";
return TYdbPqCodes(Ydb::StatusIds::BAD_REQUEST, Ydb::PersQueue::ErrorCode::VALIDATION_ERROR);
}
if (strategy.GetPartitionStrategyType() != ::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED && config.GetPartitionConfig().HasStorageLimitBytes()) {
if (config.GetPartitionConfig().HasStorageLimitBytes()) {
error = TStringBuilder() << "Auto partitioning is incompatible with retention storage bytes option";
return TYdbPqCodes(Ydb::StatusIds::BAD_REQUEST, Ydb::PersQueue::ErrorCode::VALIDATION_ERROR);
}
Expand Down