rgw/datalog: Remove `rgw default data log backing` option

Omap-backed datalogs are deprecated. This option is removed and we no
longer support creating new clusters using them.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 95477590e019f4c21e1b03c8f49abe2baccecccd..c0d63924a9fcaa446f037ec7172efa26ae5acf6a 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -13,6 +13,9 @@
 * ceph-volume: Raw BlueStore OSD preparation now pre-formats NVMe devices and
   skips the slower BlueStore discard phase,reducing mkfs time on
   very large namespaces.
+* RGW: Omap backing for the RGW Datalog is deprecated and support will be removed in a future version.
+  - The `rgw default data log backing` option is removed and it is no longer
+    possible to create clusters with an omap based datalog.
 * RGW: Bucket Logging suppports creating log buckets in EC pools.
   Implicit logging object commits are now performed asynchronously.
 * RGW: radosgw-admin bucket list now supports pagination for versioned buckets by using

diff --git a/src/common/options/rgw.yaml.in b/src/common/options/rgw.yaml.in
index ec75a707853fb6895f4a561cf36e3e94aadc5ec4..c54cc592ddce7e850296874fdf54ae2da9cd0a43 100644 (file)
--- a/src/common/options/rgw.yaml.in
+++ b/src/common/options/rgw.yaml.in
@@ -3937,19 +3937,6 @@ options:
   see_also:
   - rgw_dmclock_metadata_res
   - rgw_dmclock_metadata_wgt
-- name: rgw_default_data_log_backing
-  type: str
-  level: advanced
-  desc: Default backing store for the RGW data sync log
-  long_desc: Whether to use the older OMAP backing store or the high performance FIFO
-    based backing store by default. This only covers the creation of the log on startup
-    if none exists.
-  default: fifo
-  services:
-  - rgw
-  enum_values:
-  - fifo
-  - omap
 - name: rgw_d3n_l1_local_datacache_enabled
   type: bool
   level: advanced

diff --git a/src/rgw/driver/rados/rgw_datalog.cc b/src/rgw/driver/rados/rgw_datalog.cc
index fc9a25a60540882df53da368d6006a7fa5d5f6bb..b7f50063160451f76abe64fef4d76960c2c318b7 100644 (file)
--- a/src/rgw/driver/rados/rgw_datalog.cc
+++ b/src/rgw/driver/rados/rgw_datalog.cc
@@ -494,10 +494,6 @@ RGWDataChangesLog::start(const DoutPrefixProvider *dpp,
   down_flag = false;
   ran_background = (recovery || watch || renew);
 
-  auto defbacking = to_log_type(
-    cct->_conf.get_val<std::string>("rgw_default_data_log_backing"));
-  // Should be guaranteed by `set_enum_allowed`
-  ceph_assert(defbacking);
   try {
     loc = co_await rgw::init_iocontext(dpp, *rados, log_pool,
                                       rgw::create, asio::use_awaitable);
@@ -513,7 +509,7 @@ RGWDataChangesLog::start(const DoutPrefixProvider *dpp,
       dpp, *rados, metadata_log_oid(), loc,
       [this](uint64_t gen_id, int shard) {
        return get_oid(gen_id, shard);
-      }, num_shards, *defbacking, *this);
+      }, num_shards, log_type::fifo, *this);
   } catch (const std::exception& e) {
     ldpp_dout(dpp, -1) << __PRETTY_FUNCTION__
                       << ": Error initializing backends: " << e.what()