]> 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. 6967/head
authorJianpeng Ma <jianpeng.ma@intel.com>
Thu, 5 May 2016 15:44:57 +0000 (23:44 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Thu, 12 May 2016 13:45:12 +0000 (21:45 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osdc/Objecter.cc

index c703488bd337c8bee42d7ec9eaf00068c6be8229..05f180a3074164ba539bf8a7bda515d95fe5a1ec 100644 (file)
@@ -2290,7 +2290,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() ||