From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Thu, 5 May 2016 15:44:57 +0000 (+0800)
Subject: osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag.
X-Git-Tag: v11.0.0~214^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07b2a22210e26eac1b2825c30629788da05e5e12;p=ceph.git

osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index c703488bd33..05f180a3074 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -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() ||