Skip to content

Commit 2cd8817

Browse files
authored
Merge pull request ceph#66420 from bluikko/doc-sphinx-warnings-202511
doc: Fix Sphinx warnings
2 parents 99af533 + 08e57cb commit 2cd8817

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

doc/dev/cephfs-fscrypt.rst

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CephFS Fscrypt
2-
================
2+
==============
33

44
Fscrypt is an encryption implementation at the file system level. This file
55
system encryption allows for encrypting on a per directory level. This allows
@@ -11,7 +11,7 @@ implementation. If you would like to see the full kernel specification
1111
please visit: https://docs.kernel.org/filesystems/fscrypt.html
1212

1313
Key Derivation Process
14-
-------------------------
14+
----------------------
1515
The master key is the cornerstone to derive all keys within an fscrypt context.
1616

1717
When an fscrypt policy is applied to an empty directory, a per-directory key
@@ -27,7 +27,7 @@ the size of 4K each. These block will each be encrypted a on a per-block
2727
basis that is derived from the per-file key.
2828

2929
Generating filenames
30-
-------------------
30+
--------------------
3131
When a new inode is created, the name provided is encrypted using the
3232
per-directory key. The plaintext file name will be encrypted. This cipher
3333
text is then converted to a base64 format. This is to ensure that there are no
@@ -38,7 +38,7 @@ the ``alternate_name`` field. This cipher text will then be truncated to a small
3838
size to be base64 encoded and stored in the dname.
3939

4040
Per-block encryption keys
41-
-------------------
41+
-------------------------
4242
When data blocks are written to a file each block will be written in fscrypt
4343
block sized chunks (4096 bytes) with a unique key. Each per-block key will be
4444
derived from the per-file key+block_num. This means that each encrypted block
@@ -65,8 +65,9 @@ in Figure 1, then a rmw workload is needed. First the block is read, then
6565
decrypted based on the key+blocknum, then new data is merged with the plaintext
6666
version and then encrypted before being written out to the osds.
6767

68-
.. image:: cephfs_fscrypt_rmw_partially_aligned.svg
69-
Figure 1
68+
.. figure:: cephfs_fscrypt_rmw_partially_aligned.svg
69+
70+
Figure 1
7071

7172
To determine if a rmw is needed the offset and len of write is analyzed.
7273

@@ -81,22 +82,24 @@ To determine if a rmw is needed the offset and len of write is analyzed.
8182
be performed and any previous data read will not be needed. This behavior is
8283
shown in Figure 2. In this case, only blocks 3 and 5 will need to be read.
8384

84-
.. image:: cephfs_fscrypt_rmw_3blocks.svg
85-
Figure 2
85+
.. figure:: cephfs_fscrypt_rmw_3blocks.svg
86+
87+
Figure 2
8688

8789
Space Amplification
88-
---------------------
90+
-------------------
8991
In nearly all cases, using encryption will cause space amplification. Any data
9092
sets that aren’t uniformly aligned to fscrypt block boundaries will have this.
9193
The ``max_size`` quota is based off this amplified real size.
9294

9395
Truncates
94-
-------------------------
96+
---------
9597
In cases where a truncate call is not fscrypt block aligned, it will require
9698
rmw on the end block. Since a truncate call is handled by the mds, this rmw
9799
operation is partially handled by the mds. First, the client reads the last block.
98100
Then, as shown in Figure 3, the client requests a truncate (1), mds then does the
99101
write directly to the osds(2,3) before returning status back to the client(4).
100102

101-
.. image:: cephfs_fscrypt_truncate_handshake.svg
102-
Figure 3
103+
.. figure:: cephfs_fscrypt_truncate_handshake.svg
104+
105+
Figure 3

doc/dev/crimson/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@ Code Walkthroughs
385385
.. toctree::
386386
:maxdepth: 1
387387

388-
Crimson Developer guide <index>
389388
OSDState <osd>
390389
The ClientRequest Pipeline <pipeline>
391390
Error Handling <error-handling>

doc/rados/troubleshooting/troubleshooting-pg.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,7 @@ _
863863
--rule 0 \
864864
--num-rep 3 \
865865
--min-x 1 --max-x 10
866+
866867
::
867868

868869
0: 0

doc/radosgw/adminops.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ Special Error Responses
823823
None.
824824

825825
Get Account Info
826-
===========
826+
================
827827
.. versionadded:: Squid
828828

829829
Get account info. Either an ``id`` or a ``name`` must be provided.

0 commit comments

Comments
 (0)