From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Wed, 2 Jul 2014 18:47:52 +0000 (+0100)
Subject: osd: pg_pool_t: clear tunables on clear_tier()
X-Git-Tag: v0.80.6~103^2~2^2~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af59cbf5854bd0fabeb0ef394d7d5b1207bbd6d3;p=ceph.git

osd: pg_pool_t: clear tunables on clear_tier()

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 64bdf6c92bc44adad5a49b9dc4f674789cee80b0)
---

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 6173c2fdb98a..1800c0445584 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -916,11 +916,27 @@ public:
 
   bool is_tier() const { return tier_of >= 0; }
   bool has_tiers() const { return !tiers.empty(); }
-  void clear_tier() { tier_of = -1; }
+  void clear_tier() {
+    tier_of = -1;
+    clear_read_tier();
+    clear_write_tier();
+    clear_tier_tunables();
+  }
   bool has_read_tier() const { return read_tier >= 0; }
   void clear_read_tier() { read_tier = -1; }
   bool has_write_tier() const { return write_tier >= 0; }
   void clear_write_tier() { write_tier = -1; }
+  void clear_tier_tunables() {
+    cache_mode = CACHEMODE_NONE;
+
+    target_max_bytes = 0;
+    target_max_objects = 0;
+    cache_target_dirty_ratio_micro = 0;
+    cache_target_full_ratio_micro = 0;
+    hit_set_params = HitSet::Params();
+    hit_set_period = 0;
+    hit_set_count = 0;
+  }
 
   uint64_t target_max_bytes;   ///< tiering: target max pool size
   uint64_t target_max_objects; ///< tiering: target max pool size