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: v13.1.0~215^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21428%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 72db27a07b0c..73075230327e 100644
--- 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 66fd3b152f7d..65cb15f42917 100644
--- 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));
     }