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.

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

octopus: mds: fix purge_queue's _calculate_ops is inaccurate #37372

Merged
merged 1 commit into from Oct 12, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/mds/PurgeQueue.cc
Expand Up @@ -367,14 +367,12 @@ uint32_t PurgeQueue::_calculate_ops(const PurgeItem &item) const
ops_required = 1 + leaves.size();
} else {
// File, work out concurrent Filer::purge deletes
// Account for removing (or zeroing) backtrace
const uint64_t num = (item.size > 0) ?
Striper::get_num_objects(item.layout, item.size) : 1;

ops_required = std::min(num, g_conf()->filer_max_purge_ops);

// Account for removing (or zeroing) backtrace
ops_required += 1;

// Account for deletions for old pools
if (item.action != PurgeItem::TRUNCATE_FILE) {
ops_required += item.old_pools.size();
Expand Down