Skip to content

Commit 6687c97

Browse files
committed
doc/rados/configuration: Small improvements in ceph-conf.rst
Fix a missing space typo. Use title case in section titles. Use ref for hyperlink to a section that already has a label instead of linking to title text of the section. Use privileged command prompt for all ceph commands except ceph commands that invoke help. Use INI preformatted block for last remaining block that was just using plain preformatted. Signed-off-by: Ville Ojamo <[email protected]>
1 parent be0a5a9 commit 6687c97

File tree

1 file changed

+33
-31
lines changed

1 file changed

+33
-31
lines changed

doc/rados/configuration/ceph-conf.rst

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ sometimes change between releases. For this reason, it is best to review the
2525
version of this documentation that applies to your Ceph release. When updating
2626
to a new Ceph release, also review the release notes for important changes.
2727

28-
Option names
28+
Option Names
2929
============
3030

3131
Each Ceph configuration option has a unique name that consists of words
@@ -44,7 +44,7 @@ For the sake of clarity and
4444
convenience, we suggest that you consistently use underscores, as we do
4545
throughout this documentation.
4646

47-
Config sources
47+
Config Sources
4848
==============
4949

5050
Each Ceph daemon and client pulls configuration option values from one or more
@@ -68,7 +68,7 @@ daemon or process will commence.
6868

6969
.. _bootstrap-options:
7070

71-
Bootstrap options
71+
Bootstrap Options
7272
-----------------
7373

7474
Bootstrap options enable each Ceph daemon
@@ -96,7 +96,7 @@ option that identifies the addresses of the cluster's Monitors. When
9696
configuration file can be avoided entirely.
9797

9898

99-
Skipping monitor config
99+
Skipping Monitor Config
100100
-----------------------
101101

102102
The option ``--no-mon-config`` can be passed to any command in order to skip
@@ -107,7 +107,7 @@ but the Monitor quorum is down.
107107

108108
.. _ceph-conf-file:
109109

110-
Configuration sections
110+
Configuration Sections
111111
======================
112112

113113
Each configuration option associated with a single process or daemon
@@ -249,7 +249,7 @@ Ceph supports the following metavariables:
249249
:example: ``/var/run/ceph/$cluster-$name-$pid.asok``
250250

251251

252-
Ceph configuration file
252+
Ceph Configuration File
253253
=======================
254254

255255
On startup, Ceph processes search for a configuration file in the
@@ -279,11 +279,11 @@ text after a pound sign (#) or a semi-colon semicolon (;). For example:
279279
280280
.. _ceph-conf-settings:
281281

282-
Config file section names
282+
Config File Section Names
283283
-------------------------
284284

285285
The configuration file is divided into sections. Each section must begin with a
286-
valid configuration section name (see `Configuration sections`_, above) within
286+
valid configuration section name (see :ref:`ceph-conf-file`, above) within
287287
square brackets. For example:
288288

289289
.. code-block:: ini
@@ -300,18 +300,20 @@ square brackets. For example:
300300
[osd.2]
301301
debug_ms = 10
302302
303-
Config file option values
303+
Config File Option Values
304304
-------------------------
305305

306306
The value of a configuration option is a string. If the string is too long to
307307
fit on a single line, you may place a backslash (``\``) at the end of the line
308308
and the backslash will act as a line continuation marker. In such a case, the
309309
value of the option will be the string after ``=`` in the current line,
310-
combined with the string in the next line. Here is an example::
310+
combined with the string in the next line. Here is an example:
311311

312-
[global]
313-
foo = long long ago\
314-
long ago
312+
.. code-block:: ini
313+
314+
[global]
315+
foo = long long ago\
316+
long ago
315317
316318
In this example, the value of the "``foo``" option is "``long long ago long
317319
ago``". Be careful to not place a backslash at the end of the final line
@@ -401,7 +403,7 @@ Each configuration option specifies one of the following types for its value:
401403
A set of IPv4 or IPv6 addresses separated by commas (``,``). The set of addresses can be optionally delimited
402404
with ``[`` and ``]``.
403405

404-
:example: ``[v1:1.2.3.4:567,v2:1.2.3.4:568]``, ``v1:1.2.3.4:567,v1:1.2.3.14:567`` ``[2409:8a1e:8fb6:aa20:1260:4bff:fe92:18f5::567], [2409:8a1e:8fb6:aa20:1260:4bff:fe92:18f5::568]``
406+
:example: ``[v1:1.2.3.4:567,v2:1.2.3.4:568]``, ``v1:1.2.3.4:567,v1:1.2.3.14:567``, ``[2409:8a1e:8fb6:aa20:1260:4bff:fe92:18f5::567], [2409:8a1e:8fb6:aa20:1260:4bff:fe92:18f5::568]``
405407

406408
.. describe:: uuid
407409

@@ -453,7 +455,7 @@ and to fetch additional configuration information. In most cases this applies on
453455
records<mon-dns-lookup>` if your DNS infrastructure is very robust and
454456
under your control.
455457

456-
Sections and masks
458+
Sections and Masks
457459
------------------
458460

459461
Configuration options stored by the Monitors can be stored in a global section,
@@ -620,7 +622,7 @@ Use the ``ceph config set`` command to update configuration options. For
620622
example, to enable the most verbose debug log level on a specific OSD, run a
621623
command of the following form:
622624

623-
.. prompt:: bash $
625+
.. prompt:: bash #
624626

625627
ceph config set osd.1701 debug_ms 20
626628

@@ -632,7 +634,7 @@ command of the following form:
632634

633635
.. note:: Log subsystem levels range from 0 to 20.
634636

635-
Override values
637+
Override Values
636638
---------------
637639

638640
Runtime option values can be set temporarily by using the ``ceph tell``
@@ -648,62 +650,62 @@ Override values can be set in two ways:
648650
#. From any host, send a message to a daemon with a command of the following
649651
form:
650652

651-
.. prompt:: bash $
653+
.. prompt:: bash #
652654

653655
ceph tell <name> config set <option> <value>
654656

655657
For example:
656658

657-
.. prompt:: bash $
659+
.. prompt:: bash #
658660

659661
ceph tell osd.1701 config set debug_osd 20
660662

661663
The ``tell`` command can also accept a wildcard as the daemon identifier.
662664
For example, to adjust the debug level on all OSD daemons, run a command of
663665
the following form:
664666

665-
.. prompt:: bash $
667+
.. prompt:: bash #
666668

667669
ceph tell osd.* config set debug_osd 20
668670

669671
#. On the host where a specific daemon is running, connect to the daemon via a socket
670672
in ``/var/run/ceph`` by running a command of the following form:
671673

672-
.. prompt:: bash $
674+
.. prompt:: bash #
673675

674676
ceph daemon <name> config set <option> <value>
675677

676678
For example:
677679

678-
.. prompt:: bash $
680+
.. prompt:: bash #
679681

680682
ceph daemon osd.4 config set debug_osd 20
681683

682684
.. note:: In the output of the ``ceph config show`` command, these temporary
683685
values are shown to have a source of ``override``.
684686

685687

686-
Viewing runtime settings
688+
Viewing Runtime Settings
687689
========================
688690

689691
You can see the current settings specified for a running daemon with the ``ceph
690692
config show`` command. For example, to see the (non-default) settings for the
691693
daemon ``osd.1701``, run the following command:
692694

693-
.. prompt:: bash $
695+
.. prompt:: bash #
694696

695697
ceph config show osd.1701
696698

697699
To see only the value of a single option for a specific daemon, run a command of following form:
698700

699-
.. prompt:: bash $
701+
.. prompt:: bash #
700702

701703
ceph config show osd.1701 debug_osd
702704

703705
To see all settings for a specific daemon (including the settings with default
704706
values), run a command of the following form:
705707

706-
.. prompt:: bash $
708+
.. prompt:: bash #
707709

708710
ceph config show-with-defaults osd.1701
709711

@@ -713,26 +715,26 @@ current settings for ``osd.1701``, run the following command on the host
713715
where ``osd.1701`` runs. The host whre a daemon runs can be determined with
714716
the ``ceph osd find`` command or ``ceph orch ps`` commands.
715717

716-
.. prompt:: bash $
718+
.. prompt:: bash #
717719

718720
ceph daemon osd.1701 config show
719721

720722
To see non-default settings and to see the source of each value came (for example,
721723
a config file, the central Monitor DB, or an override), run a command of the
722724
following form:
723725

724-
.. prompt:: bash $
726+
.. prompt:: bash #
725727

726728
ceph daemon osd.1701 config diff
727729

728730
To see the value of a single option, run a command of the following form:
729731

730-
.. prompt:: bash $
732+
.. prompt:: bash #
731733

732734
ceph daemon osd.1701 config get debug_osd
733735

734736

735-
Changes introduced in Octopus
737+
Changes Introduced in Octopus
736738
=============================
737739

738740
The Octopus release changed the way that the configuration file is parsed.
@@ -746,7 +748,7 @@ These changes are as follows:
746748
warning line 42: 'foo' in section 'bar' redefined
747749
- Prior to Octopus, options containing invalid UTF-8 characters were ignored
748750
with warning messages. In Octopus and later releases they are treated as fatal errors.
749-
- The backslash character ``\`` is interpreted as aline-continuation marker that
751+
- The backslash character ``\`` is interpreted as a line-continuation marker that
750752
combines the next line with the current one. Prior to Octopus, there was a
751753
requirement that any end-of-line backslash be followed by a non-empty line.
752754
In Octopus and later releases, an empty line following a backslash is allowed.

0 commit comments

Comments
 (0)