RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 05:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21428 from ivancich/wip-fix-existing-mclock-cost

Browse Source 
osd: remove cost from mclock op queues; cost not handled well in dmclock

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2018-04-18 12:32:42 +08:00 committed by GitHub
commit 1e081a817d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/mClockClientQueue.cc
View File

@ -78,7 +78,7 @@ namespace ceph {
unsigned priority,
unsigned cost,
Request&& item) {
queue.enqueue(get_inner_client(cl, item), priority, cost, std::move(item));
queue.enqueue(get_inner_client(cl, item), priority, 0u, std::move(item));
}
// Enqueue the op in the front of the regular queue
@ -86,7 +86,7 @@ namespace ceph {
unsigned priority,
unsigned cost,
Request&& item) {
queue.enqueue_front(get_inner_client(cl, item), priority, cost,
queue.enqueue_front(get_inner_client(cl, item), priority, 0u,
std::move(item));
}

4
src/osd/mClockOpClassQueue.h
View File

@ -94,7 +94,7 @@ namespace ceph {
Request&& item) override final {
queue.enqueue(client_info_mgr.osd_op_type(item),
priority,
cost,
0u,
std::move(item));
}
@ -105,7 +105,7 @@ namespace ceph {
Request&& item) override final {
queue.enqueue_front(client_info_mgr.osd_op_type(item),
priority,
cost,
0u,
std::move(item));
}