rgw/datalog: `radosgw-admin` will no longer convert datalog to omap

Omap-backed datalogs are deprecated, so we remove the ability to
convert to them.

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index c0d63924a9fcaa446f037ec7172efa26ae5acf6a..2eb6e6be2e858415123e05d6fd77a6883bbd5ffb 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -16,6 +16,7 @@
 * 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.
+  - `radosgw-admin datalog type` will only accept `--log_type=fifo`.
 * 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/rgw/radosgw-admin/radosgw-admin.cc b/src/rgw/radosgw-admin/radosgw-admin.cc
index 2f2cbe9dc78730ac8fb5b54e9c4550a5f03dead0..f767c1d7eaacd898c20eeaeb33f3ba38e5b6ce9d 100644 (file)
--- a/src/rgw/radosgw-admin/radosgw-admin.cc
+++ b/src/rgw/radosgw-admin/radosgw-admin.cc
@@ -311,7 +311,7 @@ void usage()
   cout << "  datalog list                     list data log\n";
   cout << "  datalog trim                     trim data log\n";
   cout << "  datalog status                   read data log status\n";
-  cout << "  datalog type                     change datalog type to --log_type={fifo,omap}\n";
+  cout << "  datalog type                     change datalog type to --log_type=fifo\n";
   cout << "  datalog semaphore list           List recovery semaphores\n";
   cout << "  datalog semaphore reset          Reset recovery semaphore (use marker)\n";
   cout << "  orphans find                     deprecated -- init and run search for leaked rados objects (use job-id, pool)\n";
@@ -11427,10 +11427,14 @@ next:
       std::cerr << "log-type not specified." << std::endl;
       return -EINVAL;
     }
+    if (opt_log_type == log_type::omap) {
+      std::cerr << "omap datalogs are deprecated. You cannot convert to them." << std::endl;
+      return -EINVAL;
+    }
     auto datalog = static_cast<rgw::sal::RadosStore*>(driver)->svc()->datalog_rados;
     std::string errstr;
     ret = run_coro(dpp(), context_pool,
-                  datalog->change_format(dpp(), *opt_log_type),
+                  datalog->change_format(dpp(), log_type::fifo),
                   &errstr);
     if (ret < 0) {
       cerr << "ERROR: change_format(): " << errstr << std::endl;

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
index 008aecd56cbf6fec9952cf46a4daf43520979bf4..b62489296e6878564301da118e9d441f716890b2 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -170,7 +170,7 @@
     datalog list                     list data log
     datalog trim                     trim data log
     datalog status                   read data log status
-    datalog type                     change datalog type to --log_type={fifo,omap}
+    datalog type                     change datalog type to --log_type=fifo
     datalog semaphore list           List recovery semaphores
     datalog semaphore reset          Reset recovery semaphore (use marker)
     orphans find                     deprecated -- init and run search for leaked rados objects (use job-id, pool)