Skip to content

Commit 4068091

Browse files
Merge pull request ceph#63057 from bluikko/doc-rgw-capitalization-radosgw
doc/radosgw: Improve language, capitalization and use config database
2 parents 2fb6cf9 + db7722e commit 4068091

File tree

5 files changed

+28
-22
lines changed

5 files changed

+28
-22
lines changed

doc/radosgw/admin.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ all unauthenticated users:
862862

863863
.. note:: In a multisite configuration where a realm and a period are present,
864864
any changes to the global rate limit must be committed using ``period update
865-
--commit``. If no period is present, the rados gateway(s) must be restarted
865+
--commit``. If no period is present, the RGW instances must be restarted
866866
for the changes to take effect.
867867

868868
Usage

doc/radosgw/d3n_datacache.rst

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ D3N RGW Data Cache
77
Datacenter-Data-Delivery Network (D3N) uses high-speed storage such as NVMe flash or DRAM to cache
88
datasets on the access side.
99
Such caching allows big data jobs to use the compute and fast storage resources available on each
10-
Rados Gateway node at the edge.
10+
RADOS Gateway (RGW) node at the edge.
1111

1212
Many datacenters include low-cost, centralized storage repositories, called data lakes,
1313
to store and share terabyte and petabyte-scale datasets.
@@ -17,7 +17,7 @@ Even with a well-designed datacenter network, cluster-to-data lake bandwidth is
1717
than the bandwidth of a solid-state storage located at an edge node.
1818

1919
| D3N improves the performance of big-data jobs running in analysis clusters by speeding up recurring reads from the data lake.
20-
| The Rados Gateways act as cache servers for the back-end object store (OSDs), storing data locally for reuse.
20+
| The RADOS Gateways act as cache servers for the back-end object store (OSDs), storing data locally for reuse.
2121
2222
Architecture
2323
============
@@ -31,7 +31,7 @@ The layer 1 cache server nearest to the client handles object requests by breaki
3131
returning any blocks which are cached locally, and forwarding missed requests to the block home location
3232
(as determined by consistent hashing) in the next layer.
3333
Cache misses are forwarded to successive logical caching layers until a miss at the top layer is resolved
34-
by a request to the data lake (Rados)
34+
by a request to the data lake (RADOS)
3535

3636
:sup:`*` currently only layer 1 cache has been upstreamed.
3737

@@ -68,19 +68,23 @@ D3N Environment Setup
6868
Running
6969
-------
7070

71-
To enable D3N on an existing RGWs the following configuration entries are required
72-
in each Rados Gateways ceph.conf client section, for example for ``[client.rgw.8000]``::
71+
To enable D3N on existing RGWs the following configuration entries are required
72+
in the :ref:`ceph-conf-database`, for example for ``client.rgw.8000``:
7373

74-
[client.rgw.8000]
75-
rgw_d3n_l1_local_datacache_enabled = true
76-
rgw_d3n_l1_datacache_persistent_path = "/mnt/nvme0/rgw_datacache/client.rgw.8000/"
77-
rgw_d3n_l1_datacache_size = 10737418240
74+
.. prompt:: bash #
75+
76+
ceph config set client.rgw.8000 rgw_d3n_l1_local_datacache_enabled true
77+
ceph config set client.rgw.8000 rgw_d3n_l1_datacache_persistent_path /mnt/nvme0/rgw_datacache/client.rgw.8000/
78+
ceph config set client.rgw.8000 rgw_d3n_l1_datacache_size 10737418240
7879

7980
The above example assumes that the cache backing-store solid state device
8081
is mounted at ``/mnt/nvme0`` and has 10 GB of free space available for the cache.
8182

82-
The persistent path directory has to be created before starting the Gateway.
83-
(``mkdir -p /mnt/nvme0/rgw_datacache/client.rgw.8000/``)
83+
The directory must exist and be writable before starting the RGW daemon:
84+
85+
.. prompt:: bash #
86+
87+
mkdir -p /mnt/nvme0/rgw_datacache/client.rgw.8000/
8488

8589
In containerized deployments the cache directory should be mounted as a volume::
8690

@@ -90,15 +94,17 @@ In containerized deployments the cache directory should be mounted as a volume::
9094

9195
(Reference: `Service Management - Mounting Files with Extra Container Arguments`_)
9296

93-
If another Gateway is co-located on the same machine, configure it's persistent path to a discrete directory,
94-
for example in the case of ``[client.rgw.8001]`` configure
95-
``rgw_d3n_l1_datacache_persistent_path = "/mnt/nvme0/rgw_datacache/client.rgw.8001/"``
96-
in the ``[client.rgw.8001]`` ``ceph.conf`` client section.
97+
If another RADOS Gateway is co-located on the same host, configure its persistent
98+
path to a discrete directory, for example in the case of ``client.rgw.8001``:
99+
100+
.. prompt:: bash #
101+
102+
ceph config set client.rgw.8001 rgw_d3n_l1_datacache_persistent_path /mnt/nvme0/rgw_datacache/client.rgw.8001/
97103

98-
In a multiple co-located Gateways configuration consider assigning clients with different workloads
99-
to each Gateway without a balancer in order to avoid cached data duplication.
104+
In a multiple co-located RADOS Gateways configuration consider assigning clients with different workloads
105+
to each RADOS Gateway without a balancer in order to avoid cached data duplication.
100106

101-
.. note:: Each time the Rados Gateway is restarted the content of the cache directory is purged.
107+
.. note:: Each time the RGW daemon is restarted the content of the cache directory is purged.
102108

103109
Logs
104110
----

doc/radosgw/layout.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
===========================
2-
Rados Gateway Data Layout
2+
RADOS Gateway Data Layout
33
===========================
44

55
Although the source code is the ultimate guide, this document helps

doc/radosgw/lua-scripting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ By default, the execution of a Lua script is limited to a maximum runtime of 100
2626

2727
.. warning:: Be cautious when modifying the memory limit. If the current memory usage exceeds the newly set limit, all previously stored data in the background state will be lost.
2828

29-
.. warning:: Disabling the runtime limit may result in unbounded script execution, which can lead to excessive resource consumption and potentially impact the RADOS gateway's availability.
29+
.. warning:: Disabling the runtime limit may result in unbounded script execution, which can lead to excessive resource consumption and potentially impact the RADOS Gateway's availability.
3030

3131
By default, all Lua standard libraries are available in the script, however, in order to allow for additional Lua modules to be used in the script, we support adding packages to an allowlist:
3232

doc/radosgw/rgw-cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ and caching-out on subsequent GET requests, passing thru transparently PUT,POST,
1717

1818
The feature introduces 2 new APIs: Auth and Cache.
1919

20-
NOTE: The `D3N RGW Data Cache`_ is an alternative data caching mechanism implemented natively in the Rados Gateway.
20+
NOTE: The `D3N RGW Data Cache`_ is an alternative data caching mechanism implemented natively in the RADOS Gateway.
2121

2222
New APIs
2323
-------------------------

0 commit comments

Comments
 (0)