thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove separate list_inode_next()

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-01-01 14:19:18 +03:00
parent c8decb32e8
commit 80dda3ca94
4 changed files with 34 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd/cli_merge.cpp
+3 -8
View File
@@ -389,8 +389,8 @@ struct snap_merger_t
if (lower ? (sp.second < target_rank) : (sp.second > target_rank))
{
lists_todo++;
inode_list_t* lst = parent->cli->list_inode_start(src, parent->parallel_osds, [this, src](
inode_list_t *lst, std::set<object_id>&& objects, pg_num_t pg_num, std::vector<osd_num_t> && inactive_osds, int errcode, int status)
parent->cli->list_inode(src, parent->parallel_osds, [this, src](
int errcode, int pgs_left, pg_num_t pg_num, std::set<object_id>&& objects, std::vector<osd_num_t> && inactive_osds)
{
if (errcode)
{
@@ -416,7 +416,7 @@ struct snap_merger_t
layer_list[pos++] = obj.stripe;
}
}
if (status & INODE_LIST_DONE)
if (!pgs_left)
{
auto & name = parent->cli->st_cli.inode_config.at(src).name;
if (list_errcode.find(src) != list_errcode.end())
@@ -437,12 +437,7 @@ struct snap_merger_t
lists_todo--;
continue_merge_reent();
}
else
{
parent->cli->list_inode_next(lst);
}
});
parent->cli->list_inode_next(lst);
}
}
}