From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Fri, 18 Jan 2019 10:02:13 +0000 (+0100)
Subject: common, osd: set mclock priority as 1 by default.
X-Git-Tag: v14.1.0~296^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c6c3d9c215d1cc21aaafb1eb35cfd653f03f53c3;p=ceph-ci.git

common, osd: set mclock priority as 1 by default.

As we assert for a +ve priority, make sure that we don't supply a 0 priority

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/common/mClockPriorityQueue.h b/src/common/mClockPriorityQueue.h
index 9b96d5010c4..ae4259207a3 100644
--- a/src/common/mClockPriorityQueue.h
+++ b/src/common/mClockPriorityQueue.h
@@ -293,11 +293,11 @@ namespace ceph {
     }
 
     void enqueue_strict(K cl, unsigned priority, T&& item) override final {
-      high_queue[priority].enqueue(cl, 0, std::move(item));
+      high_queue[priority].enqueue(cl, 1, std::move(item));
     }
 
     void enqueue_strict_front(K cl, unsigned priority, T&& item) override final {
-      high_queue[priority].enqueue_front(cl, 0, std::move(item));
+      high_queue[priority].enqueue_front(cl, 1, std::move(item));
     }
 
     void enqueue(K cl, unsigned priority, unsigned cost, T&& item) override final {
diff --git a/src/osd/mClockOpClassQueue.h b/src/osd/mClockOpClassQueue.h
index f7d59283624..3ad7f71972d 100644
--- a/src/osd/mClockOpClassQueue.h
+++ b/src/osd/mClockOpClassQueue.h
@@ -105,7 +105,7 @@ namespace ceph {
 			      Request&& item) override final {
       queue.enqueue_front(client_info_mgr.osd_op_type(item),
 			  priority,
-			  0u,
+			  1u,
 			  std::move(item));
     }