allow max_active_partitions=0 when topic autopartitioning disabled (#7493)

Author: nshestakov

ydb/services/datastreams/datastreams_proxy.cpp

@@ -484,9 +484,6 @@ namespace NKikimr::NDataStreams::V1 {
             auto& s = GetProtoRequest()->partitioning_settings();
             auto* t = groupConfig.MutablePQTabletConfig()->MutablePartitionStrategy();
 
-            t->SetMinPartitionCount(s.min_active_partitions() ? s.min_active_partitions() : 1);
-            t->SetMaxPartitionCount(s.max_active_partitions() ? s.max_active_partitions() : 1);
-
             auto& as = s.auto_partitioning_settings();
             switch(as.strategy()) {
                 case Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_UNSPECIFIED:
@@ -509,6 +506,13 @@ namespace NKikimr::NDataStreams::V1 {
                     break;
             }
 
+            t->SetMinPartitionCount(s.min_active_partitions() ? s.min_active_partitions() : 1);
+            if (!s.max_active_partitions() && t->GetPartitionStrategyType() != NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED) {
+                t->SetMaxPartitionCount(1);
+            } else {
+                t->SetMaxPartitionCount(s.max_active_partitions());
+            }
+
             auto& ws = as.partition_write_speed();
             t->SetScaleThresholdSeconds(ws.stabilization_window().seconds() ? ws.stabilization_window().seconds() : 300);
             t->SetScaleUpPartitionWriteSpeedThresholdPercent(ws.up_utilization_percent() ? ws.up_utilization_percent() : 90);

ydb/services/datastreams/datastreams_ut.cpp

@@ -2896,6 +2896,36 @@ Y_UNIT_TEST_SUITE(DataStreams) {
             UNIT_ASSERT_VALUES_EQUAL(d.partitioning_settings().auto_partitioning_settings().partition_write_speed().up_utilization_percent(), 93);
             UNIT_ASSERT_VALUES_EQUAL(d.partitioning_settings().auto_partitioning_settings().partition_write_speed().down_utilization_percent(), 17);
         }
+
+        {
+            auto result = testServer.DataStreamsClient->UpdateStream(streamName2,
+                 NYDS_V1::TUpdateStreamSettings()
+                    .BeginConfigurePartitioningSettings()
+                        .MaxActivePartitions(0)
+                        .BeginConfigureAutoPartitioningSettings()
+                            .Strategy(NYdb::NDataStreams::V1::EAutoPartitioningStrategy::Disabled)
+                        .EndConfigureAutoPartitioningSettings()
+                    .EndConfigurePartitioningSettings()
+                ).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false);
+            if (result.GetStatus() != EStatus::SUCCESS) {
+                result.GetIssues().PrintTo(Cerr);
+            }
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+        }
+
+        {
+            auto result = testServer.DataStreamsClient->DescribeStream(streamName2).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false);
+            Cerr << result.GetIssues().ToString() << "\n";
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+
+            auto& d = result.GetResult().stream_description();
+            UNIT_ASSERT_VALUES_EQUAL(d.stream_status(), YDS_V1::StreamDescription::ACTIVE);
+            UNIT_ASSERT_VALUES_EQUAL(d.partitioning_settings().auto_partitioning_settings().strategy(), ::Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED);
+        }
+
     }
 
 }