Skip to content

Commit 9d423dd

Browse files
Merge pull request ceph#63480 from bluikko/doc-minor-fixes-cloud-restore-radosgw
doc/radosgw: Small improvements in cloud-restore.rst
2 parents d0dcdce + 5d40843 commit 9d423dd

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

doc/radosgw/cloud-restore.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ API can be used to restore the object temporarily.
2424
Cloud Storage Class Tier Configuration
2525
--------------------------------------
2626

27-
The `tier configuration <https://docs.ceph.com/en/latest/radosgw/cloud-transition/#cloud-storage-class-configuration>`_
28-
of the cloud storage class configured for data transition is used to restore
27+
The :ref:`radosgw_cloud_tier_configuration`
28+
of the storage class configured for data transition is used to restore
2929
objects as well::
3030

3131
{
@@ -48,20 +48,20 @@ The below options have been added to the tier configuration to facilitate object
4848

4949
* ``restore_storage_class`` (string)
5050

51-
The storage class to which object data is to be restored. Default value is ``STANDARD``.
51+
The storage class to which object data is to be restored. Default value is ``STANDARD``.
5252

5353

5454
Read-through Specific Configurables
5555
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5656

5757
* ``allow_read_through`` (``true`` | ``false``)
5858

59-
If true, enables ``read-through``. Objects can then be restored using the ``S3 GetObject`` API.
59+
If ``true``, enables ``read-through``. Objects can then be restored using the ``S3 GetObject`` API.
6060

6161
* ``read_through_restore_days`` (integer)
6262

63-
The duration for which objects restored via ``read-through`` are retained.
64-
Default value is 1 day.
63+
The duration for which objects restored via ``read-through`` are retained.
64+
Default value is ``1`` day.
6565

6666
For example:
6767

@@ -90,12 +90,12 @@ the following configurables should be set accordingly:
9090

9191
* ``glacier_restore_days`` (integer)
9292

93-
The duration for which the objects are to be restored on the remote cloud service.
93+
The duration for which the objects are to be restored on the remote cloud service.
9494

9595
* ``glacier_restore_tier_type`` (``Standard`` | ``Expedited``)
9696

97-
The type of retrieval within the cloud service, which may represent different
98-
pricing. Supported options are ``Standard`` and ``Expedited``.
97+
The type of retrieval within the cloud service, which may represent different
98+
pricing. Supported options are ``Standard`` and ``Expedited``.
9999

100100

101101
For example:
@@ -167,7 +167,7 @@ Examples of Restore Objects
167167
Using the S3 RestoreObject CLI
168168
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
169169

170-
Th `S3 restore-object <https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html>`_
170+
The `S3 restore-object <https://awscli.amazonaws.com/v2/documentation/api/latest/reference/s3api/restore-object.html>`_
171171
CLI supports these options:
172172

173173
.. prompt:: bash $
@@ -180,7 +180,7 @@ CLI supports these options:
180180
}
181181

182182

183-
Note: ``Days`` is optional and if not provided, the object is restored permanently.
183+
.. note:: The parameter ``Days`` is optional and if not provided, the object is restored permanently.
184184

185185
Example 1:
186186

@@ -219,8 +219,8 @@ Example 3:
219219

220220
This will restore the object ``doc3.rtf`` for ``read_through_restore_days`` days.
221221

222-
Note: The above CLI command may time out if object restoration takes too long.
223-
You can verify the restore status before reissuing the command.
222+
.. note:: The above CLI command may time out if object restoration takes too long.
223+
You can verify the restore status before reissuing the command.
224224

225225

226226
Verifying the Restoration Status
@@ -242,7 +242,7 @@ details.
242242

243243
Example:
244244

245-
.. prompt:: bash $
245+
.. prompt:: bash #
246246

247247
radosgw-admin object stat --bucket bucket1 --object doc1.rtf
248248

@@ -255,8 +255,8 @@ Storage
255255
~~~~~~~
256256
Objects are restored to the storage class configured via ``restore_storage_class``
257257
in the tier-config. However, as
258-
per `<https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html>`_
259-
the storage class of restored objects should remain unchanged. Therefore, for
258+
per `S3 RestoreObject <https://docs.aws.amazon.com/AmazonS3/latest/API/API_RestoreObject.html>`_
259+
API the storage class of restored objects should remain unchanged. Therefore, for
260260
temporary copies, the ``x-amz-storage-class`` will continue to reflect the
261261
original cloud-tier storage class.
262262

@@ -269,7 +269,7 @@ The ``mtime`` of the transitioned and restored objects should remain unchanged.
269269
Lifecycle
270270
~~~~~~~~~
271271
``Temporary`` copies are not subject to transition to the cloud. However, as is the
272-
case with cloud-transitioned objects, they can be deleted via regular LC (Life Cycle)
272+
case with cloud-transitioned objects, they can be deleted via regular lifecycle (LC)
273273
expiration rules or an external S3 ``delete`` request.
274274

275275
``Permanent`` copies are treated as regular objects and are subject to applicable LC

doc/radosgw/cloud-transition.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Cloud Storage Class Tier Type
3131

3232
* ``cloud-s3-glacier`` : S3 Glacier or Tape storage services.
3333

34+
.. _radosgw_cloud_tier_configuration:
3435

3536
Cloud Storage Class Tier Configuration
3637
--------------------------------------

0 commit comments

Comments
 (0)