thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-09 17:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix collector

Browse Source
This commit is contained in:
Mikhail Artemenko 2024-09-05 11:01:37 +00:00
parent c6777af485
commit 5180e58dca
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Coordination/KeeperStorage.cpp
View File

@ -1611,12 +1611,17 @@ private:
{
if constexpr (Storage::use_rocksdb)
{
std::filesystem::path root_fs_path(root_path.toString());
auto children = storage.container.getChildren(root_path.toString());
for (auto && [child_path, node] : children)
for (auto && [child_name, node] : children)
{
auto child_path = (root_fs_path / child_name).generic_string();
if (collect(child_path, node))
return true;
}
}
return false;
}
@ -1657,12 +1662,13 @@ private:
for (; it != nodes.end() && parentNodePath(it->first) == root_path; ++it)
{
chassert(it->second.node);
const String & path = it->first;
const typename Storage::Node & node = *it->second.node;
if (updateStats(node))
return true;
if (visitRootAndUncommitted(it->first, node)) /// if child is uncommitted then all subtree is also uncommitted
if (visitRootAndUncommitted(path, node)) /// if child is uncommitted then all subtree is also uncommitted
return true;
}
@ -1684,9 +1690,9 @@ private:
bool updateStats(const typename Storage::Node & root_node)
{
nodes_observed += 1 + root_node.numChildren(); /// root + all known children
nodes_observed += 1;
if (nodes_observed > limit)
if (nodes_observed + root_node.numChildren() > limit)
return true;
return false;