osdc/Objecter: remove honor_cache_redirects global flag

We can do this on a per-op basic with CEPH_OSD_FLAG_IGNORE_OVERLAY.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 225466dc15674305e1daefea014624b140d3e8f0..75144304d29d2954a95472d016945715c7c116ea 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1390,8 +1390,7 @@ int Objecter::recalc_op_target(Op *op)
     need_check_tiering = true;
   }
   
-  if (honor_cache_redirects &&
-      need_check_tiering &&
+  if (need_check_tiering &&
       (op->flags & CEPH_OSD_FLAG_IGNORE_OVERLAY) == 0) {
     const pg_pool_t *pi = osdmap->get_pg_pool(op->base_oloc.pool);
     if (pi) {

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 478fa00f9a27b1ea9dcf4eb14415aa0a5c306f91..80dd67aab48364515d4835da3d442a9f9aa72cb4 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -932,7 +932,6 @@ class Objecter {
   int global_op_flags; // flags which are applied to each IO op
   bool keep_balanced_budget;
   bool honor_osdmap_full;
-  bool honor_cache_redirects;
 
   void maybe_request_map();
 
@@ -1423,7 +1422,6 @@ public:
     num_unacked(0), num_uncommitted(0),
     global_op_flags(0),
     keep_balanced_budget(false), honor_osdmap_full(true),
-    honor_cache_redirects(true),
     last_seen_osdmap_version(0),
     last_seen_pgmap_version(0),
     client_lock(l), timer(t),
@@ -1457,9 +1455,6 @@ public:
   void set_honor_osdmap_full() { honor_osdmap_full = true; }
   void unset_honor_osdmap_full() { honor_osdmap_full = false; }
 
-  void set_honor_cache_redirects() { honor_cache_redirects = true; }
-  void unset_honor_cache_redirects() { honor_cache_redirects = false; }
-
   void scan_requests(bool skipped_map,
                     map<tid_t, Op*>& need_resend,
                     list<LingerOp*>& need_resend_linger,