From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Wed, 27 May 2015 12:50:02 +0000 (+0800)
Subject: osd: rename SKIP_PROMOTE to SKIP_HANDLE_CACHE
X-Git-Tag: v9.1.0~345^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98fff96b8f3748ed8f4dc64963af1fb90b6ff680;p=ceph.git

osd: rename SKIP_PROMOTE to SKIP_HANDLE_CACHE

To comply with what it really means.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 40f4fa3951ce..f10ead5c23f5 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8635,21 +8635,21 @@ int OSD::init_op_flags(OpRequestRef& op)
       }
 
     case CEPH_OSD_OP_DELETE:
-      // if we get a delete with FAILOK we can skip promote.  without
+      // if we get a delete with FAILOK we can skip handle cache. without
       // FAILOK we still need to promote (or do something smarter) to
       // determine whether to return ENOENT or 0.
       if (iter == m->ops.begin() &&
 	  iter->op.flags == CEPH_OSD_OP_FLAG_FAILOK) {
-	op->set_skip_promote();
+	op->set_skip_handle_cache();
       }
       break;
 
     case CEPH_OSD_OP_CACHE_TRY_FLUSH:
     case CEPH_OSD_OP_CACHE_FLUSH:
     case CEPH_OSD_OP_CACHE_EVICT:
-      // If try_flush/flush/evict is the only op, no need to promote.
+      // If try_flush/flush/evict is the only op, can skip handle cache.
       if (m->ops.size() == 1) {
-	op->set_skip_promote();
+	op->set_skip_handle_cache();
       }
       break;
 
diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 97315bc9eb32..fb6007c0fa7c 100644
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -101,8 +101,8 @@ bool OpRequest::need_class_write_cap() {
 bool OpRequest::need_promote() {
   return check_rmw(CEPH_OSD_RMW_FLAG_FORCE_PROMOTE);
 }
-bool OpRequest::need_skip_promote() {
-  return check_rmw(CEPH_OSD_RMW_FLAG_SKIP_PROMOTE);
+bool OpRequest::need_skip_handle_cache() {
+  return check_rmw(CEPH_OSD_RMW_FLAG_SKIP_HANDLE_CACHE);
 }
 
 void OpRequest::set_rmw_flags(int flags) {
@@ -122,7 +122,7 @@ void OpRequest::set_class_write() { set_rmw_flags(CEPH_OSD_RMW_FLAG_CLASS_WRITE)
 void OpRequest::set_pg_op() { set_rmw_flags(CEPH_OSD_RMW_FLAG_PGOP); }
 void OpRequest::set_cache() { set_rmw_flags(CEPH_OSD_RMW_FLAG_CACHE); }
 void OpRequest::set_promote() { set_rmw_flags(CEPH_OSD_RMW_FLAG_FORCE_PROMOTE); }
-void OpRequest::set_skip_promote() { set_rmw_flags(CEPH_OSD_RMW_FLAG_SKIP_PROMOTE); }
+void OpRequest::set_skip_handle_cache() { set_rmw_flags(CEPH_OSD_RMW_FLAG_SKIP_HANDLE_CACHE); }
 
 void OpRequest::mark_flag_point(uint8_t flag, const string& s) {
 #ifdef WITH_LTTNG
diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index 9d6a1169447d..0a79a7de536c 100644
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -66,7 +66,7 @@ struct OpRequest : public TrackedOp {
   bool need_class_read_cap();
   bool need_class_write_cap();
   bool need_promote();
-  bool need_skip_promote();
+  bool need_skip_handle_cache();
   void set_read();
   void set_write();
   void set_cache();
@@ -74,7 +74,7 @@ struct OpRequest : public TrackedOp {
   void set_class_write();
   void set_pg_op();
   void set_promote();
-  void set_skip_promote();
+  void set_skip_handle_cache();
 
   void _dump(utime_t now, Formatter *f) const;
 
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c9710bec31c1..79aedf20bf63 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1820,7 +1820,7 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op,
     return true;
   }
 
-  if (op->need_skip_promote()) {
+  if (op->need_skip_handle_cache()) {
     return false;
   }
 
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 27ef70af2224..94de7abdb2ef 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -260,7 +260,7 @@ enum {
   CEPH_OSD_RMW_FLAG_PGOP        = (1 << 5),
   CEPH_OSD_RMW_FLAG_CACHE       = (1 << 6),
   CEPH_OSD_RMW_FLAG_FORCE_PROMOTE   = (1 << 7),
-  CEPH_OSD_RMW_FLAG_SKIP_PROMOTE    = (1 << 8),
+  CEPH_OSD_RMW_FLAG_SKIP_HANDLE_CACHE = (1 << 8),
 };