summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2012-12-04 14:48:35 -0800
committerSamuel Just <sam.just@inktank.com>2012-12-04 14:48:35 -0800
commit724d5aaa3bf7e95075176582aa4d54d8e6a6caf2 (patch)
treed4610b73c3072380a953c2e564c33f0a5db46302
parentb76f12d499125c283ff1ae702653847053fd9d84 (diff)
downloadceph-724d5aaa3bf7e95075176582aa4d54d8e6a6caf2.tar.gz
doc: added some descriptions in ms-ref and filestore-config-ref
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--doc/rados/configuration/filestore-config-ref.rst12
-rw-r--r--doc/rados/configuration/ms-ref.rst6
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/rados/configuration/filestore-config-ref.rst b/doc/rados/configuration/filestore-config-ref.rst
index e45c0f7a9fc..80aed8e81a4 100644
--- a/doc/rados/configuration/filestore-config-ref.rst
+++ b/doc/rados/configuration/filestore-config-ref.rst
@@ -205,7 +205,7 @@ Journal
``filestore journal parallel``
-:Description:
+:Description: Enables parallel journaling, default for btrfs.
:Type: Boolean
:Required: No
:Default: ``false``
@@ -213,7 +213,7 @@ Journal
``filestore journal writeahead``
-:Description:
+:Description: Enables writeahead journaling, default for xfs.
:Type: Boolean
:Required: No
:Default: ``false``
@@ -221,7 +221,7 @@ Journal
``filestore journal trailing``
-:Description:
+:Description: Deprecated, never use.
:Type: Boolean
:Required: No
:Default: ``false``
@@ -233,7 +233,7 @@ Misc
``filestore merge threshold``
-:Description:
+:Description: Min number of files in a subdir before merging into parent
:Type: Integer
:Required: No
:Default: ``10``
@@ -241,7 +241,7 @@ Misc
``filestore split multiple``
-:Description:
+:Description: filestore_split_multiple*filestore_merge_threshold*16 is the max files in a subdir before splitting into child directories.
:Type: Integer
:Required: No
:Default: ``2``
@@ -249,7 +249,7 @@ Misc
``filestore update to``
-:Description:
+:Description: Limits filestore auto upgrade to specified version.
:Type: Integer
:Required: No
:Default: ``1000``
diff --git a/doc/rados/configuration/ms-ref.rst b/doc/rados/configuration/ms-ref.rst
index d76f7f3bb25..9777abb1a6b 100644
--- a/doc/rados/configuration/ms-ref.rst
+++ b/doc/rados/configuration/ms-ref.rst
@@ -5,7 +5,7 @@
``ms tcp nodelay``
-:Description:
+:Description: Disables nagle's algorithm on messenger tcp sessions.
:Type: Boolean
:Required: No
:Default: ``true``
@@ -29,7 +29,7 @@
``ms nocrc``
-:Description:
+:Description: Disables crc on network messages. May increase performance if cpu limited.
:Type: Boolean
:Required: No
:Default: ``false``
@@ -45,7 +45,7 @@
``ms dispatch throttle bytes``
-:Description:
+:Description: Throttles total size of messages waiting to be dispatched.
:Type: 64-bit Unsigned Integer
:Required: No
:Default: ``100 << 20``