]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag.
authorJianpeng Ma <jianpeng.ma@intel.com>
Thu, 5 May 2016 15:44:57 +0000 (23:44 +0800)
committerDavid Zafman <dzafman@redhat.com>
Thu, 21 Sep 2017 03:02:14 +0000 (20:02 -0700)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 07b2a22210e26eac1b2825c30629788da05e5e12)

src/osdc/Objecter.cc

index 906914c3cdbb91098a88766cc14b8d522424614a..01e79c63ed77b48d2eba6d57136d26c7bbec9b84 100644 (file)
@@ -2306,7 +2306,7 @@ void Objecter::_op_submit(Op *op, shunique_lock& sul, ceph_tid_t *ptid)
                   << dendl;
     op->target.paused = true;
     _maybe_request_map();
-  } else if ((op->target.flags & CEPH_OSD_FLAG_WRITE) &&
+  } else if ((op->target.flags & (CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_RWORDERED)) &&
             !(op->target.flags & (CEPH_OSD_FLAG_FULL_TRY |
                                   CEPH_OSD_FLAG_FULL_FORCE)) &&
             (_osdmap_full_flag() ||