Skip to content

Commit bba19c2

Browse files
Merge pull request ceph#63914 from zdover23/wip-doc-2025-06-13-backport-63005-to-tentacle
tentacle: doc/radosgw: Promptify CLI commands and fix formatting in layout.rst
2 parents f4804b1 + 26b0a52 commit bba19c2

File tree

1 file changed

+32
-12
lines changed

1 file changed

+32
-12
lines changed

doc/radosgw/layout.rst

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,37 @@ metadata, bucket indexes, and (payload) data.
2525
Metadata
2626
^^^^^^^^
2727

28-
We have three 'sections' of metadata: 'user', 'bucket', and 'bucket.instance'.
29-
You can use the following commands to inspect metadata entries: ::
28+
RGW stores multiple types of metadata. The list of types can be shown
29+
with the below command. The types as of 2025 April are shown below:
3030

31-
$ radosgw-admin metadata list
32-
$ radosgw-admin metadata list bucket
33-
$ radosgw-admin metadata list bucket.instance
34-
$ radosgw-admin metadata list user
31+
.. prompt:: bash #
3532

36-
$ radosgw-admin metadata get bucket:<bucket>
37-
$ radosgw-admin metadata get bucket.instance:<bucket>:<bucket_id>
38-
$ radosgw-admin metadata get user:<user> # get or set
33+
radosgw-admin metadata list
34+
35+
::
36+
37+
[
38+
"account",
39+
"bucket",
40+
"bucket.instance",
41+
"group",
42+
"otp",
43+
"roles",
44+
"topic",
45+
"user"
46+
]
47+
48+
Use commands of the following forms to inspect metadata entries:
49+
50+
.. prompt:: bash #
51+
52+
radosgw-admin metadata list
53+
radosgw-admin metadata list bucket
54+
radosgw-admin metadata list bucket.instance
55+
radosgw-admin metadata list user
56+
radosgw-admin metadata get bucket:<bucket>
57+
radosgw-admin metadata get bucket.instance:<bucket>:<bucket_id>
58+
radosgw-admin metadata get user:<user> # get or set
3959

4060
Some variables have been used in above commands, they are:
4161

@@ -104,7 +124,7 @@ is controlled by a 'policy' setting.[3]
104124
An RGW object may comprise multiple RADOS objects, the first of which
105125
is the ``HEAD`` that contains metadata including manifest, ACLs, content type,
106126
ETag, and user-defined metadata. The metadata is stored in xattrs.
107-
The ``HEAD` object may also inline up to :confval:`rgw_max_chunk_size` of object data, for efficiency
127+
The ``HEAD`` object may also inline up to :confval:`rgw_max_chunk_size` of object data, for efficiency
108128
and atomicity. This enables a convenenient tiering strategy: index pools
109129
are necessarily replicated (cannot be EC) and should be placed on fast SSD
110130
OSDs. With a mix of small/hot RGW objects and larger, warm/cold RGW
@@ -179,7 +199,7 @@ Known pools:
179199
testcont
180200

181201
namespace: ``users.uid``
182-
Contains _both_ per-user information (RGWUserInfo) in "<user>" objects
202+
Contains *both* per-user information (RGWUserInfo) in "<user>" objects
183203
and per-user lists of buckets in omaps of "<user>.buckets" objects.
184204
The "<user>" may contain the tenant if non-empty, for example::
185205

@@ -208,7 +228,7 @@ Known pools:
208228
example: ``default.7593.4__shadow_.488urDFerTYXavx4yAd-Op8mxehnvTI_1``
209229
<marker>_<key>
210230

211-
An example of a marker would be ``default.16004.1`` or `default.7593.4``.
231+
An example of a marker would be ``default.16004.1`` or ``default.7593.4``.
212232
The current format is ``<zone>.<instance_id>.<bucket_id>``. But once
213233
generated, a marker is not parsed again, so its format may change
214234
freely in the future.

0 commit comments

Comments
 (0)