Skip to content
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

Jump to bottom

osd/backfill: give deletion ops a cost when performing backfill #14912

Closed
wants to merge 1 commit into from
Closed

osd/backfill: give deletion ops a cost when performing backfill #14912

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
6 changes: 2 additions & 4 deletions src/osd/PrimaryLogPG.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11178,6 +11178,8 @@ uint64_t PrimaryLogPG::recover_backfill(
assert(pbi.begin == check);

to_remove.push_back(boost::make_tuple(check, pbi.objects.begin()->second, bt));
// Give deletion ops a cost in backfill, removing objects is not free.
++ops;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tested this? If we don't get replies for the deletes are you sure we'll get woken up again?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks Sages, I'm not sure about that, I will try to test it

pbi.pop_front();
}

Expand Down Expand Up @@ -11226,10 +11228,6 @@ uint64_t PrimaryLogPG::recover_backfill(
check == backfill_info.begin.get_head()))
last_backfill_started = check;

// Don't increment ops here because deletions
// are cheap and not replied to unlike real recovery_ops,
// and we can't increment ops without requeueing ourself
// for recovery.
} else {
eversion_t& obj_v = backfill_info.objects.begin()->second;

Expand Down