From: Samuel Just <sjust@redhat.com>
Date: Fri, 20 Dec 2019 01:29:58 +0000 (-0800)
Subject: osd/scheduler/OpSchedulerItem: schedule backoffs as client ops
X-Git-Tag: v15.1.0~412^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bb848ed61a33573d728b9ad4f866d83c670a4d27;p=ceph.git

osd/scheduler/OpSchedulerItem: schedule backoffs as client ops

The backoff machinery relies on backoffs being ordered the same
way as client ops.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/scheduler/OpSchedulerItem.h b/src/osd/scheduler/OpSchedulerItem.h
index 54c08437f4036..08b888c6d55a1 100644
--- a/src/osd/scheduler/OpSchedulerItem.h
+++ b/src/osd/scheduler/OpSchedulerItem.h
@@ -244,7 +244,9 @@ public:
   }
 
   op_scheduler_class get_scheduler_class() const final {
-    if (maybe_get_mosd_op()) {
+    auto type = op->get_req()->get_type();
+    if (type == CEPH_MSG_OSD_OP ||
+	type == CEPH_MSG_OSD_BACKOFF) {
       return op_scheduler_class::client;
     } else {
       return op_scheduler_class::immediate;