From: J. Eric Ivancich <ivancich@redhat.com>
Date: Fri, 13 Apr 2018 22:27:25 +0000 (-0400)
Subject: osd: remove cost from mclock op queues; cost not handled well in dmclock library
X-Git-Tag: v12.2.5~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21426%2Fhead;p=ceph.git

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 <ivancich@redhat.com>
---

diff --git a/src/osd/mClockClientQueue.cc b/src/osd/mClockClientQueue.cc
index 71a6631f26a7..f0615b7ba1b4 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 1b386fe2da20..601d60864802 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