Skip to content

Fix internal PQRB state #7792

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

Merged
merged 4 commits into from
Aug 15, 2024
Merged

Fix internal PQRB state #7792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03861d1
WIP
nshestakov Aug 14, 2024
bd897fb
fixes
nshestakov Aug 14, 2024
1990fba
fixBreakUp
nshestakov Aug 15, 2024
8f5d6c6
fix all partitions
nshestakov Aug 15, 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
29 changes: 19 additions & 10 deletions ydb/core/persqueue/read_balancer__balancing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void TPartitionFamily::AttachePartitions(const std::vector<ui32>& partitions, co
}

auto [activePartitionCount, inactivePartitionCount] = ClassifyPartitions(newPartitions);
ChangePartitionCounters(activePartitionCount, activePartitionCount);
ChangePartitionCounters(activePartitionCount, inactivePartitionCount);

if (IsActive()) {
if (!Session->AllPartitionsReadable(newPartitions)) {
Expand Down Expand Up @@ -391,7 +391,7 @@ void TPartitionFamily::InactivatePartition(ui32 partitionId) {
ActivePartitionCount += active;
InactivePartitionCount += inactive;

if (IsActive()) {
if (IsActive() && Session) {
Session->ActivePartitionCount += active;
Session->InactivePartitionCount += inactive;
}
Expand Down Expand Up @@ -710,30 +710,39 @@ bool TConsumer::BreakUpFamily(TPartitionFamily* family, ui32 partitionId, bool d
}

std::vector<ui32> members;

GetPartitionGraph().Travers(id, [&](auto childId) {
if (partitions.contains(childId)) {
members.push_back(childId);
auto [_, i] = processedPartitions.insert(childId);
if (!i) {
familiesIntersect = true;
} else {
members.push_back(childId);
}

return true;
}
return false;
});

auto* f = CreateFamily({id}, family->Status, ctx);
f->Partitions.insert(f->Partitions.end(), members.begin(), members.end());
bool locked = family->Session && (family->LockedPartitions.contains(id) ||
std::any_of(members.begin(), members.end(), [family](auto id) { return family->LockedPartitions.contains(id); }));
auto* f = CreateFamily({id}, locked ? family->Status : TPartitionFamily::EStatus::Free, ctx);
f->TargetStatus = family->TargetStatus;
f->Session = family->Session;
f->LockedPartitions = Intercept(family->LockedPartitions, f->Partitions);
f->Partitions.insert(f->Partitions.end(), members.begin(), members.end());
f->LastPipe = family->LastPipe;
if (f->Session) {
f->UpdatePartitionMapping(f->Partitions);
f->ClassifyPartitions();
if (locked) {
f->LockedPartitions = Intercept(family->LockedPartitions, f->Partitions);

f->Session = family->Session;
f->Session->Families.try_emplace(f->Id, f);
f->Session->ActivePartitionCount += f->ActivePartitionCount;
f->Session->InactivePartitionCount += f->InactivePartitionCount;
if (f->IsActive()) {
++f->Session->ActiveFamilyCount;
} else if (f->IsRelesing()) {
++f->Session->ReleasingFamilyCount;
}
}

Expand Down Expand Up @@ -1300,7 +1309,7 @@ void TConsumer::Balance(const TActorContext& ctx) {
}
}

if (session->ActiveFamilyCount > desiredFamilyCount) {
if (allowPlusOne && session->ActiveFamilyCount > desiredFamilyCount) {
--allowPlusOne;
}
}
Expand Down
10 changes: 6 additions & 4 deletions ydb/core/persqueue/read_balancer__balancing_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ void TBalancer::RenderApp(TStringStream& str) const {
TABLEH() { }
TABLEH() { str << "Id"; }
TABLEH() { str << "Partitions"; }
TABLEH() { str << "<span alt=\"All / Active / Releasing\">Families</span>"; }
TABLEH() { str << "<span alt=\"Active / Inactive / Releasing\">Statistics</span>"; };
TABLEH() { str << "<span title=\"All families / Active / Releasing\">Families</span>"; }
TABLEH() { str << "<span title=\"All partitions / Active / Inactive / Releasing\">Statistics</span>"; };
TABLEH() { str << "Client node"; }
TABLEH() { str << "Proxy node"; }
}
Expand Down Expand Up @@ -203,7 +203,8 @@ void TBalancer::RenderApp(TStringStream& str) const {
TABLED() { str << session->SessionName; }
TABLED() { str << (session->Partitions.empty() ? "" : JoinRange(", ", session->Partitions.begin(), session->Partitions.end())); }
TABLED() { str << session->Families.size() << " / " << session->ActiveFamilyCount << " / " << session->ReleasingFamilyCount; }
TABLED() { str << session->ActivePartitionCount << " / " << session->InactivePartitionCount << " / " << session->ReleasingPartitionCount; }
TABLED() { str << (session->ActivePartitionCount + session->InactivePartitionCount + session->ReleasingPartitionCount)
<< " / " << session->ActivePartitionCount << " / " << session->InactivePartitionCount << " / " << session->ReleasingPartitionCount; }
TABLED() { str << session->ClientNode; }
TABLED() { str << session->ProxyNodeId; }
}
Expand All @@ -213,7 +214,8 @@ void TBalancer::RenderApp(TStringStream& str) const {
TABLED() { str << "<strong>Total:</strong>"; }
TABLED() { }
TABLED() { str << familyAllCount << " / " << activeFamilyCount << " / " << releasingFamilyCount; }
TABLED() { str << activePartitionCount << " / " << inactivePartitionCount << " / " << releasingPartitionCount; }
TABLED() { str << (activePartitionCount + inactivePartitionCount + releasingPartitionCount) << " / " << activePartitionCount << " / "
<< inactivePartitionCount << " / " << releasingPartitionCount; }
TABLED() { }
TABLED() { }
}
Expand Down
Loading