From 3d9c49974edc510aad6f313384c4b8285108a23c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 13 Dec 2013 13:11:27 -0800 Subject: [PATCH] osd: rename IGNORE_OVERLAY -> IGNORE_CACHE This is about skipping cache logic, not the tier pool overlay property. Signed-off-by: Sage Weil --- src/include/rados.h | 2 +- src/include/rados/librados.hpp | 4 ++-- src/librados/librados.cc | 4 ++-- src/osd/ReplicatedPG.cc | 2 +- src/osd/osd_types.cc | 2 +- src/test/librados/tier.cc | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/include/rados.h b/src/include/rados.h index 57491ba6b9b32..09cc3db733405 100644 --- a/src/include/rados.h +++ b/src/include/rados.h @@ -346,7 +346,7 @@ enum { CEPH_OSD_FLAG_EXEC_PUBLIC = 0x1000, /* DEPRECATED op may exec (public) */ CEPH_OSD_FLAG_LOCALIZE_READS = 0x2000, /* read from nearby replica, if any */ CEPH_OSD_FLAG_RWORDERED = 0x4000, /* order wrt concurrent reads */ - CEPH_OSD_FLAG_IGNORE_OVERLAY = 0x8000, /* ignore pool overlay */ + CEPH_OSD_FLAG_IGNORE_CACHE = 0x8000, /* ignore cache logic */ CEPH_OSD_FLAG_SKIPRWLOCKS = 0x10000, /* skip rw locks */ }; diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp index b66e7843ade77..a5686b472ab23 100644 --- a/src/include/rados/librados.hpp +++ b/src/include/rados/librados.hpp @@ -142,7 +142,7 @@ namespace librados * ordered (e.g., waiting for degraded objects). In particular, it * will make a write followed by a read sequence be preserved. * - * IGNORE_OVERLAY will ignore the pool overlay tiering metadata and + * IGNORE_CACHE will ignore the pool overlay tiering metadata and * process the op directly on the destination pool. This is useful * for CACHE_FLUSH and CACHE_EVICT operations. */ @@ -151,7 +151,7 @@ namespace librados OPERATION_BALANCE_READS = 1, OPERATION_LOCALIZE_READS = 2, OPERATION_ORDER_READS_WRITES = 4, - OPERATION_IGNORE_OVERLAY = 8, + OPERATION_IGNORE_CACHE = 8, OPERATION_SKIPRWLOCKS = 16, }; diff --git a/src/librados/librados.cc b/src/librados/librados.cc index 74888a0aa211d..23ade32791612 100644 --- a/src/librados/librados.cc +++ b/src/librados/librados.cc @@ -951,8 +951,8 @@ static int translate_flags(int flags) op_flags |= CEPH_OSD_FLAG_LOCALIZE_READS; if (flags & librados::OPERATION_ORDER_READS_WRITES) op_flags |= CEPH_OSD_FLAG_RWORDERED; - if (flags & librados::OPERATION_IGNORE_OVERLAY) - op_flags |= CEPH_OSD_FLAG_IGNORE_OVERLAY; + if (flags & librados::OPERATION_IGNORE_CACHE) + op_flags |= CEPH_OSD_FLAG_IGNORE_CACHE; if (flags & librados::OPERATION_SKIPRWLOCKS) op_flags |= CEPH_OSD_FLAG_SKIPRWLOCKS; return op_flags; diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c929822b3b392..9f812578fbbfd 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1036,7 +1036,7 @@ void ReplicatedPG::do_op(OpRequestRef op) } } - if ((m->get_flags() & CEPH_OSD_FLAG_IGNORE_OVERLAY) == 0 && + if ((m->get_flags() & CEPH_OSD_FLAG_IGNORE_CACHE) == 0 && maybe_handle_cache(op, obc, r)) return; diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 064fa91a24ff7..9794cb106f18c 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -35,7 +35,7 @@ const char *ceph_osd_flag_name(unsigned flag) case CEPH_OSD_FLAG_EXEC_PUBLIC: return "exec_public"; case CEPH_OSD_FLAG_LOCALIZE_READS: return "localize_reads"; case CEPH_OSD_FLAG_RWORDERED: return "rwordered"; - case CEPH_OSD_FLAG_IGNORE_OVERLAY: return "ignore_overlay"; + case CEPH_OSD_FLAG_IGNORE_CACHE: return "ignore_cache"; case CEPH_OSD_FLAG_SKIPRWLOCKS: return "skiprwlocks"; default: return "???"; } diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc index 85cc62000be2f..4c7a1b41b8ca4 100644 --- a/src/test/librados/tier.cc +++ b/src/test/librados/tier.cc @@ -319,7 +319,7 @@ TEST(LibRadosTier, Evict) { op.cache_evict(); librados::AioCompletion *completion = cluster.aio_create_completion(); ASSERT_EQ(0, cache_ioctx.aio_operate( - "foo", completion, &op, librados::OPERATION_IGNORE_OVERLAY)); + "foo", completion, &op, librados::OPERATION_IGNORE_CACHE)); completion->wait_for_safe(); ASSERT_EQ(0, completion->get_return_value()); completion->release(); @@ -330,7 +330,7 @@ TEST(LibRadosTier, Evict) { librados::AioCompletion *completion = cluster.aio_create_completion(); ASSERT_EQ(0, cache_ioctx.aio_operate( "fooberdoodle", completion, &op, - librados::OPERATION_IGNORE_OVERLAY)); + librados::OPERATION_IGNORE_CACHE)); completion->wait_for_safe(); ASSERT_EQ(-ENOENT, completion->get_return_value()); completion->release(); @@ -341,7 +341,7 @@ TEST(LibRadosTier, Evict) { librados::AioCompletion *completion = cluster.aio_create_completion(); ASSERT_EQ(0, cache_ioctx.aio_operate( "bar", completion, &op, - librados::OPERATION_IGNORE_OVERLAY)); + librados::OPERATION_IGNORE_CACHE)); completion->wait_for_safe(); ASSERT_EQ(-EBUSY, completion->get_return_value()); completion->release(); -- 2.39.5