From: John Wilkins Date: Tue, 21 Jan 2014 19:51:15 +0000 (-0800) Subject: doc: Fixed end string from '' to `` to stop warnings. Enforced 80 char line. X-Git-Tag: v0.78~293 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed2decb149b05293df10953eb8222d88b30af281;p=ceph.git doc: Fixed end string from '' to `` to stop warnings. Enforced 80 char line. Signed-off-by: John Wilkins --- diff --git a/doc/rados/operations/crush-map.rst b/doc/rados/operations/crush-map.rst index e3b52aa186d3..f3b39b426a56 100644 --- a/doc/rados/operations/crush-map.rst +++ b/doc/rados/operations/crush-map.rst @@ -60,7 +60,7 @@ CRUSH Location The location of an OSD in terms of the CRUSH map's hierarchy is referred to as a 'crush location'. This location specifier takes the form of a list of key and value pairs describing a position. For example, if an OSD is in a -particular row, rack, and host, and is part of the 'default' CRUSH tree, it's +particular row, rack, and host, and is part of the 'default' CRUSH tree, its crush location could be described as:: root=default row=a rack=a12 host=foohost @@ -68,24 +68,24 @@ crush location could be described as:: Note: #. Note that the order of the keys does not matter. -#. The key name (left of ``='') must be a valid CRUSH ``type``. By default +#. The key name (left of ``=``) must be a valid CRUSH ``type``. By default these include root, datacenter, row, rack, and host, but those types can be customized to be anything appropriate by modifying the CRUSH map. #. Not all keys need to be specified. For example, by default, Ceph automatically sets a ceph-osd daemon's location to be - ``root=default host=HOSTNAME'' (based on the output from ``hostname -s''). + ``root=default host=HOSTNAME`` (based on the output from ``hostname -s``). ceph-crush-location hook ------------------------ -The ``ceph-crush-location'' utility will generate a default CRUSH location +The ``ceph-crush-location`` utility will generate a default CRUSH location string for a given daemon. The location is based on, in order of preference: -#. A ``TYPE crush location'' option in ceph.conf. For example, this - is ``osd crush location'' for OSD daemons. -#. A ``crush location'' option in ceph.conf. -#. A default of ``root=default host=HOSTNAME'' where the hostname is - generated with the ``hostname -s'' command. +#. A ``TYPE crush location`` option in ceph.conf. For example, this + is ``osd crush location`` for OSD daemons. +#. A ``crush location`` option in ceph.conf. +#. A default of ``root=default host=HOSTNAME`` where the hostname is + generated with the ``hostname -s`` command. In a typical deployment scenario, provisioning software (or the system adminstrator) can simply set the 'crush location' field in a host's @@ -96,16 +96,19 @@ and clients alike. Custom location hooks --------------------- -A customize location hook can be used in place of the generic hook for OSD daemon placement in the hierarchy. (On startup, each OSD ensure its position is correct.):: +A customize location hook can be used in place of the generic hook for OSD +daemon placement in the hierarchy. (On startup, each OSD ensure its position is +correct.):: osd crush location hook = /path/to/script -This hook is is passed several arguments (below) and should output a single line to stdout with the CRUSH location description.:: +This hook is is passed several arguments (below) and should output a single line +to stdout with the CRUSH location description.:: $ ceph-crush-location --cluster CLUSTER --id ID --type TYPE where the cluster name is typically 'ceph', the id is the daemon -identifier (the OSD number), and the daemon type is typically ``osd''. +identifier (the OSD number), and the daemon type is typically ``osd``. Editing a CRUSH Map