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 71a6631f26a79d5089ae02ee3d8191e0b2ea5603..f0615b7ba1b4b6236b416388ad775cf6329ded55 100644 (file)
--- 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 1b386fe2da2026e35fbf8e00297eb32e5a4de946..601d60864802f9bbb25b92d4f8deeebf4dde6734 100644 (file)
--- 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