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

fix VERIFY(pqGroup->TotalPartitionCount >= pqGroup->TotalGroupCount) #5121

Merged
merged 1 commit into from
Jun 3, 2024
Merged

fix VERIFY(pqGroup->TotalPartitionCount >= pqGroup->TotalGroupCount) #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,10 @@ class TAlterPQ: public TSubOperation {

bool splitMergeEnabled = AppData()->FeatureFlags.GetEnableTopicSplitMerge();
if (splitMergeEnabled) {

ui32 nextId = topic->NextPartitionId;
ui32 nextGroupId = topic->TotalGroupCount;

THashSet<ui32> involvedPartitions;

for (const auto& split : alter.GetSplit()) {
Expand Down Expand Up @@ -574,13 +578,12 @@ class TAlterPQ: public TSubOperation {
range.FromBound = keyRange ? keyRange->FromBound : Nothing();
range.ToBound = splitBoundary;

alterData->PartitionsToAdd.emplace(topic->NextPartitionId, topic->TotalGroupCount + 1, range, parents);
alterData->PartitionsToAdd.emplace(nextId++, ++nextGroupId, range, parents);

range.FromBound = splitBoundary;
range.ToBound = keyRange ? keyRange->ToBound : Nothing();

alterData->PartitionsToAdd.emplace(topic->NextPartitionId + 1, topic->TotalGroupCount + 2, range,
parents);
alterData->PartitionsToAdd.emplace(nextId++, ++nextGroupId, range, parents);
}
for (const auto& merge : alter.GetMerge()) {
alterData->TotalGroupCount += 1;
Expand Down Expand Up @@ -650,7 +653,7 @@ class TAlterPQ: public TSubOperation {
rangem = range;
}

alterData->PartitionsToAdd.emplace(topic->NextPartitionId, topic->TotalGroupCount + 1, rangem, parents);
alterData->PartitionsToAdd.emplace(nextId++, ++nextGroupId, rangem, parents);
}
}

Expand Down
85 changes: 66 additions & 19 deletions ydb/core/tx/schemeshard/ut_topic_splitmerge/ut_topic_splitmerge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,13 @@ void CreateTopic(TTestBasicRuntime& runtime, TTestEnv& env, ui64& txId, const ui
env.TestWaitNotification(runtime, txId);
}

void SplitPartition(TTestBasicRuntime& runtime, TTestEnv& env, ui64& txId, const ui32 partition, TString boundary,
void ModifyTopic(TTestBasicRuntime& runtime, TTestEnv& env, ui64& txId, std::function<void(::NKikimrSchemeOp::TPersQueueGroupDescription& scheme)> modificator,
const TVector<TExpectedResult>& expectedResults = {{TEvSchemeShard::EStatus::StatusAccepted}}) {
::NKikimrSchemeOp::TPersQueueGroupDescription scheme;
scheme.SetName("Topic1");
scheme.MutablePQTabletConfig()->MutablePartitionConfig();
auto* split = scheme.AddSplit();
split->SetPartition(partition);
split->SetSplitBoundary(boundary);

modificator(scheme);

TStringBuilder sb;
sb << scheme;
Expand All @@ -136,24 +135,25 @@ void SplitPartition(TTestBasicRuntime& runtime, TTestEnv& env, ui64& txId, const
env.TestWaitNotification(runtime, txId);
}

void MergePartition(TTestBasicRuntime& runtime, TTestEnv& env, ui64& txId, const ui32 partition,
const ui32 adjacentPartition,
void SplitPartition(TTestBasicRuntime& runtime, TTestEnv& env, ui64& txId, const ui32 partition, TString boundary,
const TVector<TExpectedResult>& expectedResults = {{TEvSchemeShard::EStatus::StatusAccepted}}) {
::NKikimrSchemeOp::TPersQueueGroupDescription scheme;
scheme.SetName("Topic1");
scheme.MutablePQTabletConfig()->MutablePartitionConfig();
auto* merge = scheme.AddMerge();
merge->SetPartition(partition);
merge->SetAdjacentPartition(adjacentPartition);

TStringBuilder sb;
sb << scheme;
TString scheme_ = sb.substr(1, sb.size() - 2);
ModifyTopic(runtime, env, txId, [&](auto& scheme) {
auto* split = scheme.AddSplit();
split->SetPartition(partition);
split->SetSplitBoundary(boundary);
}, expectedResults);
}

Cerr << scheme_ << Endl;
void MergePartition(TTestBasicRuntime& runtime, TTestEnv& env, ui64& txId, const ui32 partition,
const ui32 adjacentPartition,
const TVector<TExpectedResult>& expectedResults = {{TEvSchemeShard::EStatus::StatusAccepted}}) {

TestAlterPQGroup(runtime, ++txId, "/MyRoot/USER_1", scheme_, expectedResults);
env.TestWaitNotification(runtime, txId);
ModifyTopic(runtime, env, txId, [&](auto& scheme) {
auto* merge = scheme.AddMerge();
merge->SetPartition(partition);
merge->SetAdjacentPartition(adjacentPartition);
}, expectedResults);
}

auto DescribeTopic(TTestBasicRuntime& runtime, TString path = "/MyRoot/USER_1/Topic1", ui64 ss = TTestTxConfig::SchemeShard) {
Expand Down Expand Up @@ -232,7 +232,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTopicSplitMergeTest) {
CreateSubDomain(runtime, env, ++txId);
CreateTopic(runtime, env, ++txId, 1);

auto topic = DescribeTopic(runtime);
auto topic = DescribeTopic(runtime);
auto partition = topic.GetPartitions()[0];

UNIT_ASSERT_C(NKikimrPQ::ETopicPartitionStatus::Active == partition.GetStatus(),
Expand Down Expand Up @@ -331,6 +331,53 @@ Y_UNIT_TEST_SUITE(TSchemeShardTopicSplitMergeTest) {
ValidatePartitionChildren(partition2, {});
} // Y_UNIT_TEST(SplitWithOnePartition)

Y_UNIT_TEST(SplitTwoPartitions) {
TTestBasicRuntime runtime;
TTestEnv env = CreateTestEnv(runtime);

ui64 txId = 100;

CreateSubDomain(runtime, env, ++txId);
CreateTopic(runtime, env, ++txId, 2);

const unsigned char b0[] = {0x3F};
TString boundary0((char*)b0, sizeof(b0));

const unsigned char b1[] = {0xBF};
TString boundary1((char*)b1, sizeof(b1));

ModifyTopic(runtime, env, txId, [&](auto& scheme) {
{
auto* split = scheme.AddSplit();
split->SetPartition(0);
split->SetSplitBoundary(boundary0);
}
{
auto* split = scheme.AddSplit();
split->SetPartition(1);
split->SetSplitBoundary(boundary1);
}
});

auto topic = DescribeTopic(runtime);
auto partition0 = topic.GetPartitions()[0];
auto partition1 = topic.GetPartitions()[1];
auto partition2 = topic.GetPartitions()[2];
auto partition3 = topic.GetPartitions()[3];
auto partition4 = topic.GetPartitions()[4];
auto partition5 = topic.GetPartitions()[5];

ValidatePartitionParents(partition0, {});
ValidatePartitionParents(partition1, {});
ValidatePartitionParents(partition2, {0});
ValidatePartitionParents(partition3, {0});
ValidatePartitionParents(partition4, {1});
ValidatePartitionParents(partition5, {1});

ValidatePartitionChildren(partition0, {2, 3});
ValidatePartitionChildren(partition1, {4, 5});
} // Y_UNIT_TEST(SplitTwoPartition)

Y_UNIT_TEST(SplitWithManyPartition) {
TTestBasicRuntime runtime;
TTestEnv env = CreateTestEnv(runtime);
Expand Down
Loading