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 9b96d5010c4ac0a96b9d764367d0ec06308dec4d..ae4259207a32ab17bf689cbc57ea9fdaade9732c 100644 (file)
--- 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 f7d592836249a3bdf684d4b6763809e23d2d8cf7..3ad7f71972d179e0b972e1c4937d0fa902483c18 100644 (file)
--- 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));
     }