doc: fix formatting and a couple config defaults

``ceph.conf`` needed spaces around it to be parsed correctly.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

3 files changed, 14 insertions, 11 deletions

diff --git a/doc/config-cluster/ceph-conf.rst b/doc/config-cluster/ceph-conf.rst
index d740a8218eb..db45dbdbb5c 100644
--- a/doc/config-cluster/ceph-conf.rst
+++ b/doc/config-cluster/ceph-conf.rst
@@ -133,8 +133,9 @@ on the same host. Ideally, you will have a host for a particular type of
 process. For example, one host may run ``ceph-osd`` daemons, another host
 may run a ``ceph-mds`` daemon, and other hosts may run ``ceph-mon`` daemons.
 
-Each host has a name identified by the ``host`` setting, and a network location
-(i.e., domain name or IP address) identified by the ``addr`` setting. For example::
+Each host has a name identified by the ``host`` setting, and a network
+location (i.e., domain name or IP address) identified by the ``addr``
+setting. For example::
 
 	[osd.1]
 		host = hostNumber1
@@ -166,11 +167,13 @@ Configuration File Deployment Options
 The most common way to deploy the ``ceph.conf`` file in a cluster is to have
 all hosts share the same configuration file.
 
-You may create a ``ceph.conf`` file for each host if you wish, or specify a
-particular ``ceph.conf`` file for a subset of hosts within the cluster. However,
-using per-host ``ceph.conf``configuration files imposes a maintenance burden as the
-cluster grows. In a typical deployment, an administrator creates a ``ceph.conf`` file
-on the Administration host and then copies that file to each OSD Cluster host.
+You may create a ``ceph.conf`` file for each host if you wish, or
+specify a particular ``ceph.conf`` file for a subset of hosts within
+the cluster. However, using per-host ``ceph.conf`` configuration files
+imposes a maintenance burden as the cluster grows. In a typical
+deployment, an administrator creates a ``ceph.conf`` file on the
+Administration host and then copies that file to each OSD Cluster
+host.
 
 The current cluster deployment script, ``mkcephfs``, does not make copies of the
 ``ceph.conf``. You must copy the file manually.
diff --git a/doc/config-ref/osd-config.rst b/doc/config-ref/osd-config.rst
index 7604b464991..a7ab5163af8 100644
--- a/doc/config-ref/osd-config.rst
+++ b/doc/config-ref/osd-config.rst
@@ -25,7 +25,7 @@
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
 | ``osd shed reads min latency diff``     | Double              | 1.5                   | Percentage difference from peer. 150% default. |
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
-| ``osd client message size cap``         | 64-bit Int Unsigned | 500*1024L*1024L       | Client data allowed in-memory. 200MB default.  |
+| ``osd client message size cap``         | 64-bit Int Unsigned | 500*1024L*1024L       | Client data allowed in-memory. 500MB default.  |
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
 | ``osd stat refresh interval``           | 64-bit Int Unsigned | .5                    | The status refresh interval in seconds.        |
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
@@ -131,7 +131,7 @@
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
 | ``osd class timeout``                   | Double              | 60*60.0               | // seconds                                     |
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
-| ``osd class dir``                       | String              | "/rados-classes"      | CEPH LIBDIR                                    |
+| ``osd class dir``                       | String              | $libdir/rados-classes | where rados plugins are stored                 |
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
 | ``osd check for log corruption``        | Boolean             | false                 |                                                |
 +-----------------------------------------+---------------------+-----------------------+------------------------------------------------+
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 2aff52b1927..89bb1d113e9 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -260,7 +260,7 @@ OPTION(osd_shed_reads, OPT_INT, false)     // forward from primary to replica
 OPTION(osd_shed_reads_min_latency, OPT_DOUBLE, .01)       // min local latency
 OPTION(osd_shed_reads_min_latency_diff, OPT_DOUBLE, .01)  // min latency difference
 OPTION(osd_shed_reads_min_latency_ratio, OPT_DOUBLE, 1.5)  // 1.2 == 20% higher than peer
-OPTION(osd_client_message_size_cap, OPT_U64, 500*1024L*1024L) // default to 200MB client data allowed in-memory
+OPTION(osd_client_message_size_cap, OPT_U64, 500*1024L*1024L) // client data allowed in-memory (in bytes)
 OPTION(osd_stat_refresh_interval, OPT_DOUBLE, .5)
 OPTION(osd_pg_bits, OPT_INT, 6)  // bits per osd
 OPTION(osd_pgp_bits, OPT_INT, 6)  // bits per osd
@@ -317,7 +317,7 @@ OPTION(osd_scrub_max_interval, OPT_FLOAT, 60*60*24)   // once a day
 OPTION(osd_auto_weight, OPT_BOOL, false)
 OPTION(osd_class_error_timeout, OPT_DOUBLE, 60.0)  // seconds
 OPTION(osd_class_timeout, OPT_DOUBLE, 60*60.0) // seconds
-OPTION(osd_class_dir, OPT_STR, CEPH_LIBDIR "/rados-classes")
+OPTION(osd_class_dir, OPT_STR, CEPH_LIBDIR "/rados-classes") // where rados plugins are stored
 OPTION(osd_check_for_log_corruption, OPT_BOOL, false)
 OPTION(osd_use_stale_snap, OPT_BOOL, false)
 OPTION(osd_rollback_to_cluster_snap, OPT_STR, "")