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 72db27a07b0c8f3aa38957629f19f7ef533ef041..73075230327e156a898139f6eac968bbd18c07b4 100644 (file)
--- a/src/osd/mClockClientQueue.cc
+++ b/src/osd/mClockClientQueue.cc
@@ -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));
   }
 

diff --git a/src/osd/mClockOpClassQueue.h b/src/osd/mClockOpClassQueue.h
index 66fd3b152f7dc7b2e5241d3f73f4c0429e2d1224..65cb15f42917f611279f21f54e1688e6cc92b295 100644 (file)
--- a/src/osd/mClockOpClassQueue.h
+++ b/src/osd/mClockOpClassQueue.h
@@ -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));
     }