diff options
| author | Seena Fallah <seenafallah@gmail.com> | 2024-09-02 19:01:09 +0200 |
|---|---|---|
| committer | Seena Fallah <seenafallah@gmail.com> | 2024-09-23 19:16:02 +0200 |
| commit | 138ac6aa182ea7d2aab5e24c2abaee44fe0e4971 (patch) | |
| tree | cd308f5966cc89fabd2582a5f394da6a32c5f58f | |
| parent | Merge pull request #58478 from rhcs-dashboard/carbon-forms-fs (diff) | |
| download | ceph-138ac6aa182ea7d2aab5e24c2abaee44fe0e4971.tar.xz ceph-138ac6aa182ea7d2aab5e24c2abaee44fe0e4971.zip | |
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>
| -rw-r--r-- | doc/radosgw/config-ref.rst | 1 | ||||
| -rw-r--r-- | src/common/options/rgw.yaml.in | 8 | ||||
| -rw-r--r-- | src/rgw/driver/rados/rgw_datalog.h | 5 |
3 files changed, 1 insertions, 13 deletions
diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst index 070e00967ae..12dbef4c132 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 66617d040be..f383c8fce8c 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 58042df2c62..6cfaee9dc82 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"; } |