From 9ab4294999a773bcdf5375a4619dfb4ea22c5989 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Thu, 5 May 2016 23:44:57 +0800 Subject: [PATCH] osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag. Signed-off-by: Jianpeng Ma (cherry picked from commit 07b2a22210e26eac1b2825c30629788da05e5e12) --- src/osdc/Objecter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 906914c3cdbb9..01e79c63ed77b 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -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() || -- 2.39.5