Skip to content

Fixed altering of max_active_partition property of the topic (#16768) #16797

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.

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

Open
wants to merge 1 commit into
base: stable-25-1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ydb/core/kqp/provider/yql_kikimr_exec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ namespace {
FromString<ui32>(setting.Value().Cast<TCoDataCtor>().Literal().Cast<TCoAtom>().Value())
);
} else if (name == "setMaxPartitions") {
request->mutable_alter_partitioning_settings()->set_set_partition_count_limit(
request->mutable_alter_partitioning_settings()->set_set_max_active_partitions(
FromString<ui32>(setting.Value().Cast<TCoDataCtor>().Literal().Cast<TCoAtom>().Value())
);
} else if (name == "setRetentionPeriod") {
Expand Down
62 changes: 62 additions & 0 deletions ydb/core/persqueue/ut/ut_with_sdk/autoscaling_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,68 @@ Y_UNIT_TEST_SUITE(TopicAutoscaling) {
}
}

Y_UNIT_TEST(PartitionSplit_AutosplitByLoad_AfterAlter) {
TTopicSdkTestSetup setup = CreateSetup();
TTopicClient client = setup.MakeClient();

TCreateTopicSettings createSettings;
createSettings
.BeginConfigurePartitioningSettings()
.MinActivePartitions(1)
.EndConfigurePartitioningSettings();
client.CreateTopic(TEST_TOPIC, createSettings).Wait();

TAlterTopicSettings alterSettings;
alterSettings
.BeginAlterPartitioningSettings()
.MinActivePartitions(1)
.MaxActivePartitions(100)
.BeginAlterAutoPartitioningSettings()
.UpUtilizationPercent(2)
.DownUtilizationPercent(1)
.StabilizationWindow(TDuration::Seconds(2))
.Strategy(EAutoPartitioningStrategy::ScaleUp)
.EndAlterAutoPartitioningSettings()
.EndAlterTopicPartitioningSettings();
client.AlterTopic(TEST_TOPIC, alterSettings).Wait();

auto msg = TString(1_MB, 'a');

auto writeSession_1 = CreateWriteSession(client, "producer-1", 0, std::string{TEST_TOPIC}, false);
auto writeSession_2 = CreateWriteSession(client, "producer-2", 0, std::string{TEST_TOPIC}, false);

{
UNIT_ASSERT(writeSession_1->Write(Msg(msg, 1)));
UNIT_ASSERT(writeSession_1->Write(Msg(msg, 2)));
Sleep(TDuration::Seconds(5));
auto describe = client.DescribeTopic(TEST_TOPIC).GetValueSync();
UNIT_ASSERT_EQUAL(describe.GetTopicDescription().GetPartitions().size(), 1);
}

{
UNIT_ASSERT(writeSession_1->Write(Msg(msg, 3)));
UNIT_ASSERT(writeSession_2->Write(Msg(msg, 4)));
UNIT_ASSERT(writeSession_1->Write(Msg(msg, 5)));
UNIT_ASSERT(writeSession_2->Write(Msg(msg, 6)));
Sleep(TDuration::Seconds(5));
auto describe = client.DescribeTopic(TEST_TOPIC).GetValueSync();
UNIT_ASSERT_EQUAL(describe.GetTopicDescription().GetPartitions().size(), 3);
}

auto writeSession2_1 = CreateWriteSession(client, "producer-1", 1, std::string{TEST_TOPIC}, false);
auto writeSession2_2 = CreateWriteSession(client, "producer-2", 1, std::string{TEST_TOPIC}, false);

{
UNIT_ASSERT(writeSession2_1->Write(Msg(msg, 7)));
UNIT_ASSERT(writeSession2_2->Write(Msg(msg, 8)));
UNIT_ASSERT(writeSession2_1->Write(Msg(msg, 9)));
UNIT_ASSERT(writeSession2_2->Write(Msg(msg, 10)));
Sleep(TDuration::Seconds(5));
auto describe2 = client.DescribeTopic(TEST_TOPIC).GetValueSync();
UNIT_ASSERT_EQUAL(describe2.GetTopicDescription().GetPartitions().size(), 5);
}
}

void ExecuteQuery(NYdb::NTable::TSession& session, const TString& query ) {
const auto result = session.ExecuteSchemeQuery(query).GetValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
Expand Down
48 changes: 48 additions & 0 deletions ydb/services/persqueue_v1/topic_yql_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,54 @@ Y_UNIT_TEST_SUITE(TTopicYqlTest) {
//1609462861
}

Y_UNIT_TEST(AlterAutopartitioning) {
NKikimrConfig::TFeatureFlags ff;
ff.SetEnableTopicSplitMerge(true);
auto settings = NKikimr::NPersQueueTests::PQSettings();
settings.SetFeatureFlags(ff);

NPersQueue::TTestServer server(settings);

{
const char *query = R"(
CREATE TOPIC `/Root/PQ/rt3.dc1--legacy--topic1`
)";

server.AnnoyingClient->RunYqlSchemeQuery(query);
}

{
const char *query = R"__(
ALTER TOPIC `/Root/PQ/rt3.dc1--legacy--topic1`
SET (
min_active_partitions = 7,
max_active_partitions = 100,
auto_partitioning_stabilization_window = Interval('PT1S'),
auto_partitioning_up_utilization_percent = 2,
auto_partitioning_down_utilization_percent = 1,
partition_write_speed_bytes_per_second = 3,
auto_partitioning_strategy = 'up'
);
)__";

server.AnnoyingClient->RunYqlSchemeQuery(query);
}

{
auto pqGroup = server.AnnoyingClient->Ls("/Root/PQ/rt3.dc1--legacy--topic1")->Record.GetPathDescription().GetPersQueueGroup();
const auto& describe = pqGroup.GetPQTabletConfig();

Cerr <<"=== PATH DESCRIPTION: \n" << pqGroup.DebugString();
UNIT_ASSERT_VALUES_EQUAL(describe.GetPartitionConfig().GetWriteSpeedInBytesPerSecond(), 3);
UNIT_ASSERT_VALUES_EQUAL(describe.GetPartitionStrategy().GetMinPartitionCount(), 7);
UNIT_ASSERT_VALUES_EQUAL(describe.GetPartitionStrategy().GetMaxPartitionCount(), 100);
UNIT_ASSERT_VALUES_EQUAL(describe.GetPartitionStrategy().GetScaleThresholdSeconds(), 1);
UNIT_ASSERT_VALUES_EQUAL(describe.GetPartitionStrategy().GetScaleUpPartitionWriteSpeedThresholdPercent(), 2);
UNIT_ASSERT_VALUES_EQUAL(describe.GetPartitionStrategy().GetScaleDownPartitionWriteSpeedThresholdPercent(), 1);
UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(describe.GetPartitionStrategy().GetPartitionStrategyType()), static_cast<int>(::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_CAN_SPLIT));
}
}

Y_UNIT_TEST(BadRequests) {
NPersQueue::TTestServer server;
{
Expand Down
Loading