Skip to content

NodesManager cleanup #8863

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 1 commit into from
Sep 6, 2024
Merged

NodesManager cleanup #8863

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
10 changes: 5 additions & 5 deletions ydb/core/fq/libs/actors/nodes_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class TNodesManagerActor : public NActors::TActorBootstrapped<TNodesManagerActor
TPeer node = {SelfId().NodeId(), InstanceId + "," + HostName(), 0, 0, 0, DataCenter};
bool selfPlacement = true;
if (!Peers.empty()) {
auto FirstPeer = NextPeer;
auto firstPeer = NextPeer;
while (true) {
Y_ABORT_UNLESS(NextPeer < Peers.size());
auto& nextNode = Peers[NextPeer];
Expand All @@ -154,9 +154,9 @@ class TNodesManagerActor : public NActors::TActorBootstrapped<TNodesManagerActor
NextPeer = 0;
}

if ( (!UseDataCenter || DataCenter.empty() || nextNode.DataCenter.empty() || DataCenter == nextNode.DataCenter) // non empty DC must match
&& ( nextNode.MemoryLimit == 0 // memory is NOT limited
|| nextNode.MemoryLimit >= nextNode.MemoryAllocated + totalMemoryLimit) // or enough
if ((!UseDataCenter || DataCenter.empty() || nextNode.DataCenter.empty() || DataCenter == nextNode.DataCenter) // non empty DC must match
&& (nextNode.MemoryLimit == 0 // memory is NOT limited
|| nextNode.MemoryLimit >= nextNode.MemoryAllocated + totalMemoryLimit) // or enough
) {
// adjust allocated size to place next tasks correctly, will be reset after next health check
nextNode.MemoryAllocated += totalMemoryLimit;
Expand All @@ -169,7 +169,7 @@ class TNodesManagerActor : public NActors::TActorBootstrapped<TNodesManagerActor
break;
}

if (NextPeer == FirstPeer) { // we closed loop w/o success, fallback to self placement then
if (NextPeer == firstPeer) { // we closed loop w/o success, fallback to self placement then
break;
}
}
Expand Down