From 7d4d4f750a48dd680d56b2149a6da106a419fb6c Mon Sep 17 00:00:00 2001
From: Mahati Chamarthy <mahati.chamarthy@intel.com>
Date: Tue, 12 Jan 2021 13:38:02 +0530
Subject: [PATCH] librbd/cache/pwl: Rename config options

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
---
 src/common/options.cc                                     | 6 +++---
 src/librbd/cache/pwl/AbstractWriteLog.cc                  | 6 ++++--
 src/librbd/cache/pwl/ImageCacheState.cc                   | 4 ++--
 src/librbd/plugin/WriteLogImageCache.cc                   | 6 +++---
 src/test/librbd/cache/pwl/test_mock_ReplicatedWriteLog.cc | 2 +-
 src/test/librbd/cache/pwl/test_mock_SSDWriteLog.cc        | 2 +-
 src/test/librbd/test_fixture.cc                           | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index 74e0378ad14..ffb30838515 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7734,16 +7734,16 @@ static std::vector<Option> get_rbd_options() {
     .set_enum_allowed({"disabled", "rwl", "ssd"})
     .set_description("enable persistent write back cache for this volume"),
 
-    Option("rbd_rwl_log_periodic_stats", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    Option("rbd_persistent_cache_log_periodic_stats", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)
     .set_description("emit periodic perf stats to debug log"),
 
-    Option("rbd_rwl_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    Option("rbd_persistent_cache_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(1073741824)
     .set_min(1073741824)
     .set_description("size of the persistent write back cache for this volume"),
 
-    Option("rbd_rwl_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
+    Option("rbd_persistent_cache_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("/tmp")
     .set_description("location of the persistent write back cache in a DAX-enabled filesystem on persistent memory"),
 
diff --git a/src/librbd/cache/pwl/AbstractWriteLog.cc b/src/librbd/cache/pwl/AbstractWriteLog.cc
index 987f5258df8..9a15b05788a 100644
--- a/src/librbd/cache/pwl/AbstractWriteLog.cc
+++ b/src/librbd/cache/pwl/AbstractWriteLog.cc
@@ -496,9 +496,11 @@ void AbstractWriteLog<I>::pwl_init(Context *on_finish, DeferredContexts &later)
 
   if (!m_cache_state->present) {
     m_cache_state->host = ceph_get_short_hostname();
-    m_cache_state->size = m_image_ctx.config.template get_val<uint64_t>("rbd_rwl_size");
+    m_cache_state->size = m_image_ctx.config.template get_val<uint64_t>(
+        "rbd_persistent_cache_size");
 
-    string path = m_image_ctx.config.template get_val<string>("rbd_rwl_path");
+    string path = m_image_ctx.config.template get_val<string>(
+        "rbd_persistent_cache_path");
     std::string pool_name = m_image_ctx.md_ctx.get_pool_name();
     m_cache_state->path = path + "/rbd-pwl." + pool_name + "." + m_image_ctx.id + ".pool";
   }
diff --git a/src/librbd/cache/pwl/ImageCacheState.cc b/src/librbd/cache/pwl/ImageCacheState.cc
index 4320024b316..2c6117d9e2f 100644
--- a/src/librbd/cache/pwl/ImageCacheState.cc
+++ b/src/librbd/cache/pwl/ImageCacheState.cc
@@ -40,7 +40,7 @@ ImageCacheState<I>::ImageCacheState(I *image_ctx, plugin::Api<I>& plugin_api) :
                             << dendl;
 
   ConfigProxy &config = image_ctx->config;
-  log_periodic_stats = config.get_val<bool>("rbd_rwl_log_periodic_stats");
+  log_periodic_stats = config.get_val<bool>("rbd_persistent_cache_log_periodic_stats");
   cache_type = config.get_val<std::string>("rbd_persistent_cache_mode");
 }
 
@@ -63,7 +63,7 @@ ImageCacheState<I>::ImageCacheState(
 
   // Others from config
   ConfigProxy &config = image_ctx->config;
-  log_periodic_stats = config.get_val<bool>("rbd_rwl_log_periodic_stats");
+  log_periodic_stats = config.get_val<bool>("rbd_persistent_cache_log_periodic_stats");
 }
 
 template <typename I>
diff --git a/src/librbd/plugin/WriteLogImageCache.cc b/src/librbd/plugin/WriteLogImageCache.cc
index 2a32841f4b4..308bb6a00ad 100644
--- a/src/librbd/plugin/WriteLogImageCache.cc
+++ b/src/librbd/plugin/WriteLogImageCache.cc
@@ -8,6 +8,7 @@
 #include "librbd/ImageCtx.h"
 #include "librbd/cache/WriteLogImageDispatch.h"
 #include "librbd/cache/ImageWriteback.h"
+#include "librbd/cache/Utils.h"
 #include "librbd/cache/pwl/DiscardRequest.h"
 #include "librbd/cache/pwl/InitRequest.h"
 #include "librbd/io/ImageDispatcherInterface.h"
@@ -41,9 +42,8 @@ void WriteLogImageCache<I>::init(I* image_ctx, Api<I>& api,
                                  cache::ImageWritebackInterface& image_writeback,
                                  PluginHookPoints& hook_points_list,
                                  Context* on_finish) {
-  bool rwl_enabled = image_ctx->config.template get_val<bool>(
-    "rbd_rwl_enabled");
-  if (!rwl_enabled || !image_ctx->data_ctx.is_valid()) {
+  bool pwl_enabled = librbd::cache::util::is_pwl_enabled(*image_ctx);
+  if (!pwl_enabled || !image_ctx->data_ctx.is_valid()) {
     on_finish->complete(0);
     return;
   }
diff --git a/src/test/librbd/cache/pwl/test_mock_ReplicatedWriteLog.cc b/src/test/librbd/cache/pwl/test_mock_ReplicatedWriteLog.cc
index 77faee08f3b..e01f1b585e4 100644
--- a/src/test/librbd/cache/pwl/test_mock_ReplicatedWriteLog.cc
+++ b/src/test/librbd/cache/pwl/test_mock_ReplicatedWriteLog.cc
@@ -83,7 +83,7 @@ struct TestMockCacheReplicatedWriteLog : public TestMockFixture {
     ASSERT_EQ(host, state.host);
     ASSERT_EQ(path, state.path);
     ASSERT_EQ(size, state.size);
-    ASSERT_EQ(config.get_val<bool>("rbd_rwl_log_periodic_stats"),
+    ASSERT_EQ(config.get_val<bool>("rbd_persistent_cache_log_periodic_stats"),
 	      state.log_periodic_stats);
   }
 
diff --git a/src/test/librbd/cache/pwl/test_mock_SSDWriteLog.cc b/src/test/librbd/cache/pwl/test_mock_SSDWriteLog.cc
index 22a9dcb1d06..63eebd0c28d 100644
--- a/src/test/librbd/cache/pwl/test_mock_SSDWriteLog.cc
+++ b/src/test/librbd/cache/pwl/test_mock_SSDWriteLog.cc
@@ -85,7 +85,7 @@ struct TestMockCacheSSDWriteLog : public TestMockFixture {
     ASSERT_EQ(host, state.host);
     ASSERT_EQ(path, state.path);
     ASSERT_EQ(size, state.size);
-    ASSERT_EQ(config.get_val<bool>("rbd_rwl_log_periodic_stats"),
+    ASSERT_EQ(config.get_val<bool>("rbd_persistent_cache_log_periodic_stats"),
 	      state.log_periodic_stats);
   }
 
diff --git a/src/test/librbd/test_fixture.cc b/src/test/librbd/test_fixture.cc
index ba55e0a2056..9ddebec482e 100644
--- a/src/test/librbd/test_fixture.cc
+++ b/src/test/librbd/test_fixture.cc
@@ -62,7 +62,7 @@ void TestFixture::SetUp() {
   ASSERT_EQ(0, _rados.ioctx_create(_pool_name.c_str(), m_ioctx));
   m_cct = reinterpret_cast<CephContext*>(m_ioctx.cct());
   librados::Rados rados(m_ioctx);
-  rados.conf_set("rbd_rwl_path", ".");
+  rados.conf_set("rbd_persistent_cache_path", ".");
 
   m_image_name = get_temp_image_name();
   m_image_size = 2 << 20;
-- 
2.39.5