From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 19 Apr 2017 14:53:57 +0000 (+0200)
Subject: Revert "osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag."
X-Git-Tag: v10.2.8~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eac0e27193c67ffca60b5e7c61e7769ad8ace6aa;p=ceph.git

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

This reverts commit 2d68822c784eb4d62d3b0198ed4ec04404dbffb3.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 8daed367c9f..45c7e660a2d 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() ||