Skip to content

Commit 138ac6a

Browse files
committed
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 <[email protected]>
1 parent a1cd410 commit 138ac6a

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
@@ -2066,14 +2066,6 @@ options:
20662066
services:
20672067
- rgw
20682068
with_legacy: true
2069-
- name: rgw_data_log_obj_prefix
2070-
type: str
2071-
level: dev
2072-
default: data_log
2073-
fmt_desc: The object name prefix for the data log.
2074-
services:
2075-
- rgw
2076-
with_legacy: true
20772069
- name: rgw_data_sync_poll_interval
20782070
type: int
20792071
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)