From eac0e27193c67ffca60b5e7c61e7769ad8ace6aa Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 19 Apr 2017 16:53:57 +0200 Subject: [PATCH] Revert "osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag." This reverts commit 2d68822c784eb4d62d3b0198ed4ec04404dbffb3. Signed-off-by: Nathan Cutler --- 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 8daed367c9faa..45c7e660a2d15 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -2301,7 +2301,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 | CEPH_OSD_FLAG_RWORDERED)) && + } else if ((op->target.flags & CEPH_OSD_FLAG_WRITE) && !(op->target.flags & (CEPH_OSD_FLAG_FULL_TRY | CEPH_OSD_FLAG_FULL_FORCE)) && (_osdmap_full_flag() || -- 2.39.5