From 05af48f2e655389976356513286ed28f8cbfd5f5 Mon Sep 17 00:00:00 2001 From: "J. Eric Ivancich" Date: Fri, 13 Apr 2018 18:27:25 -0400 Subject: [PATCH] osd: remove cost from mclock op queues; cost not handled well in dmclock library The current version of the dmclock library does not handle operation cost well. Therefore cost should not be passed into the library when enqueuing operations; instead 0 should be passed in. Signed-off-by: J. Eric Ivancich --- src/osd/mClockClientQueue.cc | 4 ++-- src/osd/mClockOpClassQueue.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/mClockClientQueue.cc b/src/osd/mClockClientQueue.cc index 71a6631f26a..f0615b7ba1b 100644 --- a/src/osd/mClockClientQueue.cc +++ b/src/osd/mClockClientQueue.cc @@ -147,7 +147,7 @@ namespace ceph { unsigned priority, unsigned cost, Request item) { - queue.enqueue(get_inner_client(cl, item), priority, cost, item); + queue.enqueue(get_inner_client(cl, item), priority, 0u, item); } // Enqueue the op in the front of the regular queue @@ -155,7 +155,7 @@ namespace ceph { unsigned priority, unsigned cost, Request item) { - queue.enqueue_front(get_inner_client(cl, item), priority, cost, item); + queue.enqueue_front(get_inner_client(cl, item), priority, 0u, item); } // Return an op to be dispatched diff --git a/src/osd/mClockOpClassQueue.h b/src/osd/mClockOpClassQueue.h index 1b386fe2da2..601d6086480 100644 --- a/src/osd/mClockOpClassQueue.h +++ b/src/osd/mClockOpClassQueue.h @@ -100,7 +100,7 @@ namespace ceph { unsigned priority, unsigned cost, Request item) override final { - queue.enqueue(get_osd_op_type(item), priority, cost, item); + queue.enqueue(get_osd_op_type(item), priority, 0u, item); } // Enqueue the op in the front of the regular queue @@ -108,7 +108,7 @@ namespace ceph { unsigned priority, unsigned cost, Request item) override final { - queue.enqueue_front(get_osd_op_type(item), priority, cost, item); + queue.enqueue_front(get_osd_op_type(item), priority, 0u, item); } // Returns if the queue is empty -- 2.47.3