From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Wed, 11 Mar 2015 08:12:48 +0000 (+0800)
Subject: osd: only allow pin/unpin op on the cache tier
X-Git-Tag: v10.0.0~62^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a07d4c95b64b62ab541c9557d84c0a4a8e2555e4;p=ceph.git

osd: only allow pin/unpin op on the cache tier

Reject the op when the pin/unpin op is not on the cache tier.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index e4d9d3129263..a8f0b64de1b4 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5074,9 +5074,15 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
       break;
 
     case CEPH_OSD_OP_CACHE_PIN:
+      tracepoint(osd, do_osd_op_pre_cache_pin, soid.oid.name.c_str(), soid.snap.val);
+      if ((!pool.info.is_tier() ||
+	  pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE)) {
+        result = -EINVAL;
+        dout(10) << " pin object is only allowed on the cache tier " << dendl;
+        break;
+      }
       ++ctx->num_write;
       {
-	tracepoint(osd, do_osd_op_pre_cache_pin, soid.oid.name.c_str(), soid.snap.val);
         if (!obs.exists) {
 	  assert(!oi.is_cache_pinned());
           ctx->mod_desc.create();
@@ -5097,9 +5103,15 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
       break;
 
     case CEPH_OSD_OP_CACHE_UNPIN:
+      tracepoint(osd, do_osd_op_pre_cache_unpin, soid.oid.name.c_str(), soid.snap.val);
+      if ((!pool.info.is_tier() ||
+	  pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE)) {
+        result = -EINVAL;
+        dout(10) << " pin object is only allowed on the cache tier " << dendl;
+        break;
+      }
       ++ctx->num_write;
       {
-	tracepoint(osd, do_osd_op_pre_cache_unpin, soid.oid.name.c_str(), soid.snap.val);
         if (!obs.exists) {
 	  result = 0;
 	  break;