Skip to content
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

Jump to bottom

Fix describe and topics alter #9713

Merged
merged 5 commits into from
Sep 25, 2024
Merged

Fix describe and topics alter #9713

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddf8d01
fix describe and topics alter
niksaveliev Sep 24, 2024
29605a2
fix
niksaveliev Sep 25, 2024
a59ef51
ut
niksaveliev Sep 25, 2024
2b0adf9
fix
niksaveliev Sep 25, 2024
c39bccc
fix
niksaveliev Sep 25, 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
22 changes: 14 additions & 8 deletions ydb/services/datastreams/datastreams_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,14 +471,7 @@ namespace NKikimr::NDataStreams::V1 {
Y_UNUSED(selfInfo);

TString error;
if (!GetProtoRequest()->has_partitioning_settings()) {
if (!ValidateShardsCount(*GetProtoRequest(), pqGroupDescription, error))
{
return ReplyWithError(Ydb::StatusIds::BAD_REQUEST, static_cast<size_t>(NYds::EErrorCodes::BAD_REQUEST), error);
}

groupConfig.SetTotalGroupCount(GetProtoRequest()->target_shard_count());
}
switch (GetProtoRequest()->retention_case()) {
case Ydb::DataStreams::V1::UpdateStreamRequest::RetentionCase::kRetentionPeriodHours:
groupConfig.MutablePQTabletConfig()->MutablePartitionConfig()->SetLifetimeSeconds(
Expand Down Expand Up @@ -520,7 +513,19 @@ namespace NKikimr::NDataStreams::V1 {
}
}

if (GetProtoRequest()->has_partitioning_settings()) {
if (!GetProtoRequest()->has_partitioning_settings() ||
(GetProtoRequest()->partitioning_settings().has_auto_partitioning_settings() &&
GetProtoRequest()->partitioning_settings().auto_partitioning_settings().strategy() ==
Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED)) {

if (!ValidateShardsCount(*GetProtoRequest(), pqGroupDescription, error))
{
return ReplyWithError(Ydb::StatusIds::BAD_REQUEST, static_cast<size_t>(NYds::EErrorCodes::BAD_REQUEST), error);
}

groupConfig.SetTotalGroupCount(GetProtoRequest()->target_shard_count());

} else {
auto r = ValidatePartitioningSettings(GetProtoRequest()->partitioning_settings());
if (!r.empty()) {
return ReplyWithError(Ydb::StatusIds::BAD_REQUEST, static_cast<size_t>(NYds::EErrorCodes::INVALID_ARGUMENT), r);
Expand All @@ -532,6 +537,7 @@ namespace NKikimr::NDataStreams::V1 {
auto& as = s.auto_partitioning_settings();
switch(as.strategy()) {
case Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_UNSPECIFIED:
break;
niksaveliev marked this conversation as resolved.
Show resolved Hide resolved
case Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED:
case Ydb::DataStreams::V1::AutoPartitioningStrategy::AutoPartitioningStrategy_INT_MAX_SENTINEL_DO_NOT_USE_:
case Ydb::DataStreams::V1::AutoPartitioningStrategy::AutoPartitioningStrategy_INT_MIN_SENTINEL_DO_NOT_USE_:
Expand Down
62 changes: 61 additions & 1 deletion ydb/services/datastreams/datastreams_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,7 +2706,6 @@ Y_UNIT_TEST_SUITE(DataStreams) {

TString streamName = "test-topic";
TString streamName2 = "test-topic-2";

{
NYdb::NTopic::TTopicClient pqClient(*testServer.Driver);
auto settings = NYdb::NTopic::TCreateTopicSettings()
Expand Down Expand Up @@ -2807,6 +2806,67 @@ Y_UNIT_TEST_SUITE(DataStreams) {
UNIT_ASSERT_VALUES_EQUAL(description.shards(4).parent_shard_id(), "shard-000001");
}

auto streamForAlterTest = "stream-alter-test";
{
auto result = testServer.DataStreamsClient->CreateStream(streamForAlterTest,
NYDS_V1::TCreateStreamSettings()
.ShardCount(3)
).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(streamForAlterTest).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.shards().size(), 3);
UNIT_ASSERT_VALUES_EQUAL(d.stream_status(), YDS_V1::StreamDescription::ACTIVE);
UNIT_ASSERT_VALUES_EQUAL(d.stream_name(), streamForAlterTest);
UNIT_ASSERT_VALUES_EQUAL(d.stream_arn(), streamForAlterTest);

UNIT_ASSERT_VALUES_EQUAL(d.partitioning_settings().auto_partitioning_settings().strategy(), ::Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED);
}

{
auto result = testServer.DataStreamsClient->UpdateStream(streamForAlterTest,
NYDS_V1::TUpdateStreamSettings()
.TargetShardCount(5)
.BeginConfigurePartitioningSettings()
niksaveliev marked this conversation as resolved.
Show resolved Hide resolved
.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(streamForAlterTest).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.shards().size(), 5);
UNIT_ASSERT_VALUES_EQUAL(d.stream_status(), YDS_V1::StreamDescription::ACTIVE);
UNIT_ASSERT_VALUES_EQUAL(d.stream_name(), streamForAlterTest);
UNIT_ASSERT_VALUES_EQUAL(d.stream_arn(), streamForAlterTest);

UNIT_ASSERT_VALUES_EQUAL(d.partitioning_settings().auto_partitioning_settings().strategy(), ::Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED);
}

{
auto result = testServer.DataStreamsClient->CreateStream(streamName2,
NYDS_V1::TCreateStreamSettings()
Expand Down
27 changes: 23 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 @@ -1164,7 +1164,26 @@ namespace NKikimr::NGRpcProxy::V1 {
auto pqTabletConfig = pqDescr.MutablePQTabletConfig();
NPQ::Migrate(*pqTabletConfig);
auto partConfig = pqTabletConfig->MutablePartitionConfig();
auto splitMergeFeatureEnabled = appData->FeatureFlags.GetEnableTopicSplitMerge();

auto finalAutoPartitioningEnabled = false;
if (appData->FeatureFlags.GetEnableTopicSplitMerge()) {

auto reqHasAutoPartitioningStrategyChange = request.has_alter_partitioning_settings() &&
request.alter_partitioning_settings().has_alter_auto_partitioning_settings() &&
request.alter_partitioning_settings().alter_auto_partitioning_settings().has_set_strategy();

auto pqConfigHasAutoPartitioningStrategy = pqTabletConfig->HasPartitionStrategy() &&
pqTabletConfig->GetPartitionStrategy().HasPartitionStrategyType() &&
pqTabletConfig->GetPartitionStrategy().GetPartitionStrategyType();

if (reqHasAutoPartitioningStrategyChange) {
finalAutoPartitioningEnabled = request.alter_partitioning_settings().alter_auto_partitioning_settings().set_strategy() != ::Ydb::Topic::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED;
} else if (pqConfigHasAutoPartitioningStrategy) {
finalAutoPartitioningEnabled = pqTabletConfig->GetPartitionStrategy().GetPartitionStrategyType() != ::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED;
}

}


if (request.has_set_retention_storage_mb()) {
CHECK_CDC;
Expand All @@ -1178,12 +1197,12 @@ namespace NKikimr::NGRpcProxy::V1 {
if (settings.has_set_min_active_partitions()) {
auto minParts = IfEqualThenDefault<i64>(settings.set_min_active_partitions(), 0L, 1L);
pqDescr.SetTotalGroupCount(minParts);
if (splitMergeFeatureEnabled) {
if (finalAutoPartitioningEnabled) {
pqTabletConfig->MutablePartitionStrategy()->SetMinPartitionCount(minParts);
}
}

if (splitMergeFeatureEnabled) {
if (finalAutoPartitioningEnabled) {
if (settings.has_set_max_active_partitions()) {
pqTabletConfig->MutablePartitionStrategy()->SetMaxPartitionCount(settings.set_max_active_partitions());
}
Expand Down Expand Up @@ -1219,7 +1238,7 @@ namespace NKikimr::NGRpcProxy::V1 {
}
}

if (splitMergeFeatureEnabled) {
if (finalAutoPartitioningEnabled) {
auto code = ValidatePartitionStrategy(*pqTabletConfig, error);
if (code) return code->YdbCode;
}
Expand Down
2 changes: 1 addition & 1 deletion ydb/services/persqueue_v1/actors/schema_actors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ void TDescribeTopicActor::HandleCacheNavigateResponse(TEvTxProxySchemeCache::TEv
}

const auto &config = pqDescr.GetPQTabletConfig();
if (AppData(TActivationContext::ActorContextFor(SelfId()))->FeatureFlags.GetEnableTopicSplitMerge()) {
if (AppData(TActivationContext::ActorContextFor(SelfId()))->FeatureFlags.GetEnableTopicSplitMerge() && NPQ::SplitMergeEnabled(config)) {
Result.mutable_partitioning_settings()->set_min_active_partitions(config.GetPartitionStrategy().GetMinPartitionCount());
} else {
Result.mutable_partitioning_settings()->set_min_active_partitions(pqDescr.GetTotalGroupCount());
Expand Down
Loading