Skip to content

Ignore auto partitions fields if disabled to 24 3 #9365

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
niksaveliev merged 2 commits into from
Sep 18, 2024
Merged

Ignore auto partitions fields if disabled to 24 3 #9365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4c0a7a
Ignore auto partitioning fields if disabled
niksaveliev Sep 16, 2024
db67711
fix
niksaveliev Sep 17, 2024
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: 4 additions & 4 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 @@ -688,9 +688,6 @@ namespace NKikimr::NGRpcProxy::V1 {
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 Down Expand Up @@ -1098,7 +1095,10 @@ namespace NKikimr::NGRpcProxy::V1 {
return TYdbPqCodes(Ydb::StatusIds::BAD_REQUEST, Ydb::PersQueue::ErrorCode::VALIDATION_ERROR);
}
minParts = std::max<ui32>(1, settings.min_active_partitions());
if (appData->FeatureFlags.GetEnableTopicSplitMerge() && request.has_partitioning_settings()) {
if (appData->FeatureFlags.GetEnableTopicSplitMerge() &&
request.partitioning_settings().has_auto_partitioning_settings() &&
request.partitioning_settings().auto_partitioning_settings().strategy() != ::Ydb::Topic::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED) {

auto pqTabletConfigPartStrategy = pqTabletConfig->MutablePartitionStrategy();
auto autoscaleSettings = settings.auto_partitioning_settings();
pqTabletConfigPartStrategy->SetMinPartitionCount(minParts);
Expand Down
3 changes: 2 additions & 1 deletion ydb/services/persqueue_v1/topic_yql_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ Y_UNIT_TEST_SUITE(TTopicYqlTest) {
CREATE TOPIC `/Root/PQ/rt3.dc1--legacy--topic1` (
CONSUMER c1
) WITH (min_active_partitions = 2,
partition_count_limit = 5
partition_count_limit = 5,
auto_partitioning_strategy = 'scale_up'
);
)__";

Expand Down