RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-22 03:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

osdc/Objecter: remove honor_cache_redirects global flag

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

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-12-10 09:50:01 -08:00
parent 42d6af1c30
commit 330a13059f
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osdc/Objecter.cc
View File

@ -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) {

5
src/osdc/Objecter.h
View File

@ -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,