vitalif
/
vitastor
5
4
Fork 9
Code Issues 1 Pull Requests 2 Actions Releases 69 Wiki Activity

Fix non-working "pagination" during PG dirty object flushing

epoch-deletions
Vitaliy Filippov 2023-04-08 02:40:48 +03:00
parent 6eff3a60a5
commit 0ddd787c38
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/osd_flush.cpp
View File

@ -99,10 +99,9 @@ void osd_t::handle_flush_op(bool rollback, pool_id_t pool_id, pg_num_t pg_num, p
std::vector<osd_op_t*> continue_ops; std::vector<osd_op_t*> continue_ops;
auto & pg = pgs.at(pg_id); auto & pg = pgs.at(pg_id);
auto it = pg.flush_actions.begin(), prev_it = it; auto it = pg.flush_actions.begin(), prev_it = it;
auto erase_start = it;
while (1) while (1)
{ {
if (it == pg.flush_actions.end() || if (it == pg.flush_actions.end() || !it->second.submitted ||
it->first.oid.inode != prev_it->first.oid.inode || it->first.oid.inode != prev_it->first.oid.inode ||
(it->first.oid.stripe & ~STRIPE_MASK) != (prev_it->first.oid.stripe & ~STRIPE_MASK)) (it->first.oid.stripe & ~STRIPE_MASK) != (prev_it->first.oid.stripe & ~STRIPE_MASK))
{ {
@ -120,25 +119,15 @@ void osd_t::handle_flush_op(bool rollback, pool_id_t pool_id, pg_num_t pg_num, p
pg.write_queue.erase(wr_it); pg.write_queue.erase(wr_it);
} }
} }
if ((it == pg.flush_actions.end() || !it->second.submitted) && if (it == pg.flush_actions.end() || !it->second.submitted)
erase_start != it)
{
pg.flush_actions.erase(erase_start, it);
}
if (it == pg.flush_actions.end())
{ {
if (it != pg.flush_actions.begin())
{
pg.flush_actions.erase(pg.flush_actions.begin(), it);
}
break; break;
} }
prev_it = it; prev_it = it++;
if (!it->second.submitted)
{
it++;
erase_start = it;
}
else
{
it++;
}
} }
delete fb; delete fb;
pg.flush_batch = NULL; pg.flush_batch = NULL;