From: Seena Fallah <seenafallah@gmail.com>
Date: Mon, 2 Sep 2024 17:01:09 +0000 (+0200)
Subject: rgw: remove rgw_data_log_obj_prefix
X-Git-Tag: v20.0.0~936^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=138ac6aa182ea7d2aab5e24c2abaee44fe0e4971;p=ceph.git

rgw: remove rgw_data_log_obj_prefix

The evaluation based on rgw_data_log_obj_prefix had a logical error
not considering the value and always were returning "data_log".
As the config was having the dev level and apparantly it was useless
and fixing the logic could break the existing clusters (if they don't
adopt before upgrade), it was decided to remove the config.

Fixes: https://tracker.ceph.com/issues/67861
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
---

diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst
index 070e00967ae11..12dbef4c132dc 100644
--- a/doc/radosgw/config-ref.rst
+++ b/doc/radosgw/config-ref.rst
@@ -149,7 +149,6 @@ file under each ``[client.radosgw.{instance-name}]`` instance.
 .. confval:: rgw_run_sync_thread
 .. confval:: rgw_data_log_window
 .. confval:: rgw_data_log_changes_size
-.. confval:: rgw_data_log_obj_prefix
 .. confval:: rgw_data_log_num_shards
 .. confval:: rgw_md_log_max_shards
 .. confval:: rgw_data_sync_poll_interval
diff --git a/src/common/options/rgw.yaml.in b/src/common/options/rgw.yaml.in
index 66617d040bed4..f383c8fce8cb4 100644
--- a/src/common/options/rgw.yaml.in
+++ b/src/common/options/rgw.yaml.in
@@ -2066,14 +2066,6 @@ options:
   services:
   - rgw
   with_legacy: true
-- name: rgw_data_log_obj_prefix
-  type: str
-  level: dev
-  default: data_log
-  fmt_desc: The object name prefix for the data log.
-  services:
-  - rgw
-  with_legacy: true
 - name: rgw_data_sync_poll_interval
   type: int
   level: dev
diff --git a/src/rgw/driver/rados/rgw_datalog.h b/src/rgw/driver/rados/rgw_datalog.h
index 58042df2c62e9..6cfaee9dc82e0 100644
--- a/src/rgw/driver/rados/rgw_datalog.h
+++ b/src/rgw/driver/rados/rgw_datalog.h
@@ -241,10 +241,7 @@ class RGWDataChangesLog {
   std::unique_ptr<DataLogBackends> bes;
 
   const int num_shards;
-  std::string get_prefix() {
-    auto prefix = cct->_conf->rgw_data_log_obj_prefix;
-    return prefix.empty() ? prefix : "data_log";
-  }
+  std::string get_prefix() { return "data_log"; }
   std::string metadata_log_oid() {
     return get_prefix() + "generations_metadata";
   }