opt: Rename rgw_bucket_info_cache_expiry_interval

Rename it to rgw_cache_expiry_interval, to be specific. It already
controls the user cache, and will expire objects in the cache onto
which those two are chained.

Fixes: http://tracker.ceph.com/issues/22517
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/common/options.cc b/src/common/options.cc
index d5fc04a3b39ebcfd93d5009aae420214eb822c33..e4d1c233ba50f9e3f54a9ff312539fca2a502dfd 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5617,14 +5617,14 @@ std::vector<Option> get_rgw_options() {
     .set_default(10_min)
     .set_description(""),
 
-    Option("rgw_bucket_info_cache_expiry_interval", Option::TYPE_UINT,
+    Option("rgw_cache_expiry_interval", Option::TYPE_UINT,
           Option::LEVEL_ADVANCED)
     .set_default(15_min)
-    .set_description("Number of seconds before entries in the bucket info "
-                    "cache are assumed stale and re-fetched. Zero is never.")
+    .set_description("Number of seconds before entries in the cache are "
+                    "assumed stale and re-fetched. Zero is never.")
     .add_tag("performance")
     .add_service("rgw")
-    .set_long_description("The Rados Gateway stores metadata about buckets in "
+    .set_long_description("The Rados Gateway stores metadata and objects in "
                          "an internal cache. This should be kept consistent "
                          "by the OSD's relaying notify events between "
                          "multiple watching RGW processes. In the event "

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index e45c81fec0d735c885ab276716258fbdd5755795..af911d8ba7d7479f8b79477f85b06df87e308cf6 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -3768,7 +3768,7 @@ public:
   void init(RGWRados *store) {
     store->register_chained_cache(this);
     expiry = std::chrono::seconds(store->ctx()->_conf->get_val<uint64_t>(
-                                   "rgw_bucket_info_cache_expiry_interval"));
+                                   "rgw_cache_expiry_interval"));
   }
 
   boost::optional<T> find(const string& key) {