Skip to content

Commit e89b0ff

Browse files
authored
Merge pull request ceph#59567 from clwluvw/rgw-datachangelog
rgw: remove rgw_data_log_obj_prefix Reviewed-by: Jiffin Tony Thottan <[email protected]> Reviewed-by: Casey Bodley <[email protected]>
2 parents 16f3dad + 138ac6a commit e89b0ff

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

doc/radosgw/config-ref.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ file under each ``[client.radosgw.{instance-name}]`` instance.
149149
.. confval:: rgw_run_sync_thread
150150
.. confval:: rgw_data_log_window
151151
.. confval:: rgw_data_log_changes_size
152-
.. confval:: rgw_data_log_obj_prefix
153152
.. confval:: rgw_data_log_num_shards
154153
.. confval:: rgw_md_log_max_shards
155154
.. confval:: rgw_data_sync_poll_interval

src/common/options/rgw.yaml.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,14 +2078,6 @@ options:
20782078
services:
20792079
- rgw
20802080
with_legacy: true
2081-
- name: rgw_data_log_obj_prefix
2082-
type: str
2083-
level: dev
2084-
default: data_log
2085-
fmt_desc: The object name prefix for the data log.
2086-
services:
2087-
- rgw
2088-
with_legacy: true
20892081
- name: rgw_data_sync_poll_interval
20902082
type: int
20912083
level: dev

src/rgw/driver/rados/rgw_datalog.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,7 @@ class RGWDataChangesLog {
241241
std::unique_ptr<DataLogBackends> bes;
242242

243243
const int num_shards;
244-
std::string get_prefix() {
245-
auto prefix = cct->_conf->rgw_data_log_obj_prefix;
246-
return prefix.empty() ? prefix : "data_log";
247-
}
244+
std::string get_prefix() { return "data_log"; }
248245
std::string metadata_log_oid() {
249246
return get_prefix() + "generations_metadata";
250247
}

0 commit comments

Comments
 (0)