Revert "osdc/Objecter: resend RWORDERED ops on full"

This reverts commit f2474042ecd6560323673170c13f2cb964406e70.

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 5617d015076dd5f89505b31fbcfadc93242c1f5c..8daed367c9faaf01ec95fbae9044022d42d334d5 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1036,7 +1036,8 @@ void Objecter::_scan_requests(OSDSession *s,
     int r = _calc_target(&op->target, &op->last_force_resend);
     switch (r) {
     case RECALC_OP_TARGET_NO_ACTION:
-      if (!force_resend && !(force_resend_writes && op->respects_full()))
+      if (!force_resend &&
+         (!force_resend_writes || !(op->target.flags & CEPH_OSD_FLAG_WRITE)))
        break;
       // -- fall-thru --
     case RECALC_OP_TARGET_NEED_RESEND:
@@ -2300,7 +2301,9 @@ void Objecter::_op_submit(Op *op, shunique_lock& sul, ceph_tid_t *ptid)
                   << dendl;
     op->target.paused = true;
     _maybe_request_map();
-  } else if (op->respects_full() &&
+  } 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() ||
              _osdmap_pool_full(op->target.base_oloc.pool))) {
     ldout(cct, 0) << " FULL, paused modify " << op << " tid "

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index f0cc99269cc259ffa864796d8893bd3a5b39a9d9..8167306dd8517c02da6596d1748cd14440a15883 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1330,12 +1330,6 @@ public:
       return tid < other.tid;
     }
 
-    bool respects_full() const {
-      return
-       (target.flags & (CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_RWORDERED)) &&
-       !(target.flags & (CEPH_OSD_FLAG_FULL_TRY | CEPH_OSD_FLAG_FULL_FORCE));
-    }
-
   private:
     ~Op() {
       while (!out_handler.empty()) {