Skip to content

Commit 85a95db

Browse files
authored
Ignore auto partitions fields if disabled to 24 3 9 hot (ydb-platform#9367)
1 parent f5c68b5 commit 85a95db

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

ydb/services/lib/actors/pq_schema_actor.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -688,9 +688,6 @@ namespace NKikimr::NGRpcProxy::V1 {
688688
if (!config.HasPartitionStrategy()) {
689689
return std::nullopt;
690690
}
691-
if (::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED == config.GetPartitionStrategy().GetPartitionStrategyType()) {
692-
return std::nullopt;
693-
}
694691
auto strategy = config.GetPartitionStrategy();
695692
if (strategy.GetMinPartitionCount() < 0) {
696693
error = TStringBuilder() << "Partitions count must be non-negative, provided " << strategy.GetMinPartitionCount();
@@ -1098,7 +1095,10 @@ namespace NKikimr::NGRpcProxy::V1 {
10981095
return TYdbPqCodes(Ydb::StatusIds::BAD_REQUEST, Ydb::PersQueue::ErrorCode::VALIDATION_ERROR);
10991096
}
11001097
minParts = std::max<ui32>(1, settings.min_active_partitions());
1101-
if (appData->FeatureFlags.GetEnableTopicSplitMerge() && request.has_partitioning_settings()) {
1098+
if (appData->FeatureFlags.GetEnableTopicSplitMerge() &&
1099+
request.partitioning_settings().has_auto_partitioning_settings() &&
1100+
request.partitioning_settings().auto_partitioning_settings().strategy() != ::Ydb::Topic::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED) {
1101+
11021102
auto pqTabletConfigPartStrategy = pqTabletConfig->MutablePartitionStrategy();
11031103
auto autoscaleSettings = settings.auto_partitioning_settings();
11041104
pqTabletConfigPartStrategy->SetMinPartitionCount(minParts);

ydb/services/persqueue_v1/topic_yql_ut.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Y_UNIT_TEST_SUITE(TTopicYqlTest) {
3535
CREATE TOPIC `/Root/PQ/rt3.dc1--legacy--topic1` (
3636
CONSUMER c1
3737
) WITH (min_active_partitions = 2,
38-
partition_count_limit = 5
38+
partition_count_limit = 5,
39+
auto_partitioning_strategy = 'scale_up'
3940
);
4041
)__";
4142

0 commit comments

Comments
 (0)