From: Cory Snyder <csnyder@1111systems.com>
Date: Wed, 4 Oct 2023 09:42:30 +0000 (-0400)
Subject: rgw: add versioning info to radosgw-admin bucket stats output
X-Git-Tag: v17.2.8~382^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f99e18f2af76bfd0b901545b95bb3608e4332e63;p=ceph.git

rgw: add versioning info to radosgw-admin bucket stats output

This allows admins to more easily identify whether a bucket
has versioning / object lock/ mfa enabled.

Fixes: https://tracker.ceph.com/issues/63092
Signed-off-by: Cory Snyder <csnyder@1111systems.com>
(cherry picked from commit 7752b9019d4444a499051669539cfd67b83e0d44)

Conflicts:
	src/rgw/driver/rados/rgw_bucket.cc

Cherry-pick notes:
- Conflicts due to RADOS could being moved into driver directory in later releases.
---

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index f3dbf2a0a46..8bf6b323abf 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1505,6 +1505,8 @@ static int bucket_stats(rgw::sal::Store* store,
     return ret;
   }
 
+  const RGWBucketInfo& bucket_info = bucket->get_info();
+
   string bucket_ver, master_ver;
   string max_marker;
   ret = bucket->read_stats(dpp, RGW_NO_SHARD, &bucket_ver, &master_ver, stats, &max_marker);
@@ -1527,6 +1529,10 @@ static int bucket_stats(rgw::sal::Store* store,
   formatter->dump_string("id", bucket->get_bucket_id());
   formatter->dump_string("marker", bucket->get_marker());
   formatter->dump_stream("index_type") << bucket->get_info().layout.current_index.layout.type;
+  formatter->dump_bool("versioned", bucket_info.versioned());
+  formatter->dump_bool("versioning_enabled", bucket_info.versioning_enabled());
+  formatter->dump_bool("object_lock_enabled", bucket_info.obj_lock_enabled());
+  formatter->dump_bool("mfa_enabled", bucket_info.mfa_enabled());
   ::encode_json("owner", bucket->get_info().owner, formatter);
   formatter->dump_string("ver", bucket_ver);
   formatter->dump_string("master_ver", master_ver);