From: Samuel Just <sjust@redhat.com>
Date: Fri, 8 Jan 2016 21:26:39 +0000 (-0800)
Subject: ECBackend: send subop writes and reads at normal priority
X-Git-Tag: v0.94.8~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8573%2Fhead;p=ceph.git

ECBackend: send subop writes and reads at normal priority

We want these to be processed ahead of new client ops since
there are resources being held.

Fixes: 14313
Backport: hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit b1151c4b8b7f22c7ac067da059d087007b0bc8ea)
---

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 00cbd54c6d74..8f2b571acc44 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -1590,7 +1590,6 @@ void ECBackend::start_write(Op *op) {
       op->on_local_applied_sync = 0;
     } else {
       MOSDECSubOpWrite *r = new MOSDECSubOpWrite(sop);
-      r->set_priority(cct->_conf->osd_client_op_priority);
       r->pgid = spg_t(get_parent()->primary_spg_t().pgid, i->shard);
       r->map_epoch = get_parent()->get_epoch();
       get_parent()->send_message_osd_cluster(
@@ -1726,7 +1725,7 @@ void ECBackend::objects_read_async(
 	c)));
 
   start_read_op(
-    cct->_conf->osd_client_op_priority,
+    CEPH_MSG_PRIO_DEFAULT,
     for_read_op,
     OpRequestRef());
   return;