From 81279e3bb6e05e8bbfb314338ff861da9039293f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 9 Dec 2013 16:34:15 -0800 Subject: [PATCH] osd/ReplicatedPG: rename invalidate_forward Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 5 ++++- src/osd/osd_types.h | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index f72377845f9da..09c912bc3af29 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1241,7 +1241,10 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op, ObjectContextRef obc, promote_object(op, obc); return true; - case pg_pool_t::CACHEMODE_INVALIDATE_FORWARD: + case pg_pool_t::CACHEMODE_FORWARD: + if (obc.get() && obc->obs.exists) { + return false; + } do_cache_redirect(op, obc); return true; diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index afba5562b2bb0..12913cc3c0b71 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -745,14 +745,14 @@ struct pg_pool_t { typedef enum { CACHEMODE_NONE = 0, ///< no caching CACHEMODE_WRITEBACK = 1, ///< write to cache, flush later - CACHEMODE_INVALIDATE_FORWARD = 2, ///< delete from cache, forward write + CACHEMODE_FORWARD = 2, ///< forward if not in cache CACHEMODE_READONLY = 3, ///< handle reads, forward writes [not strongly consistent] } cache_mode_t; static const char *get_cache_mode_name(cache_mode_t m) { switch (m) { case CACHEMODE_NONE: return "none"; case CACHEMODE_WRITEBACK: return "writeback"; - case CACHEMODE_INVALIDATE_FORWARD: return "invalidate+forward"; + case CACHEMODE_FORWARD: return "forward"; case CACHEMODE_READONLY: return "readonly"; default: return "unknown"; } @@ -762,8 +762,8 @@ struct pg_pool_t { return CACHEMODE_NONE; if (s == "writeback") return CACHEMODE_WRITEBACK; - if (s == "invalidate+forward") - return CACHEMODE_INVALIDATE_FORWARD; + if (s == "forward") + return CACHEMODE_FORWARD; if (s == "readonly") return CACHEMODE_READONLY; return (cache_mode_t)-1; -- 2.39.5