update ceph source to reef 18.1.2

[ceph.git] / ceph / doc / rados / configuration / journal-ref.rst

diff --git a/ceph/doc/rados/configuration/journal-ref.rst b/ceph/doc/rados/configuration/journal-ref.rst
index 71c74c60659505326b3d59b51c8d2e597d885804..5ce5a5e2dd1bbebd2f8587f595a96df4aa39ef4d 100644 (file)
--- a/ceph/doc/rados/configuration/journal-ref.rst
+++ b/ceph/doc/rados/configuration/journal-ref.rst
@@ -1,7 +1,7 @@
 ==========================
  Journal Config Reference
 ==========================
-
+.. warning:: Filestore has been deprecated in the Reef release and is no longer supported.
 .. index:: journal; journal configuration
 
 Filestore OSDs use a journal for two reasons: speed and consistency.  Note
@@ -30,90 +30,10 @@ Filestore is preferred for new deployments.
 
 Ceph OSD Daemons recognize the following journal settings: 
 
-
-``journal_dio``
-
-:Description: Enables direct i/o to the journal. Requires ``journal block 
-              align`` set to ``true``.
-              
-:Type: Boolean
-:Required: Yes when using ``aio``.
-:Default: ``true``
-
-
-
-``journal_aio``
-
-.. versionchanged:: 0.61 Cuttlefish
-
-:Description: Enables using ``libaio`` for asynchronous writes to the journal. 
-              Requires ``journal dio`` set to ``true``.
-
-:Type: Boolean 
-:Required: No.
-:Default: Version 0.61 and later, ``true``. Version 0.60 and earlier, ``false``.
-
-
-``journal_block_align``
-
-:Description: Block aligns write operations. Required for ``dio`` and ``aio``.
-:Type: Boolean
-:Required: Yes when using ``dio`` and ``aio``.
-:Default: ``true``
-
-
-``journal_max_write_bytes``
-
-:Description: The maximum number of bytes the journal will write at 
-              any one time.
-
-:Type: Integer
-:Required: No
-:Default: ``10 << 20``
-
-
-``journal_max_write_entries``
-
-:Description: The maximum number of entries the journal will write at 
-              any one time.
-
-:Type: Integer
-:Required: No
-:Default: ``100``
-
-
-``journal_queue_max_ops``
-
-:Description: The maximum number of operations allowed in the queue at 
-              any one time.
-
-:Type: Integer
-:Required: No
-:Default: ``500``
-
-
-``journal_queue_max_bytes``
-
-:Description: The maximum number of bytes allowed in the queue at 
-              any one time.
-
-:Type: Integer
-:Required: No
-:Default: ``10 << 20``
-
-
-``journal_align_min_size``
-
-:Description: Align data payloads greater than the specified minimum.
-:Type: Integer
-:Required: No
-:Default: ``64 << 10``
-
-
-``journal_zero_on_create``
-
-:Description: Causes the file store to overwrite the entire journal with 
-              ``0``'s during ``mkfs``.
-:Type: Boolean
-:Required: No
-:Default: ``false``
+.. confval:: journal_dio
+.. confval:: journal_aio
+.. confval:: journal_block_align
+.. confval:: journal_max_write_bytes
+.. confval:: journal_max_write_entries
+.. confval:: journal_align_min_size
+.. confval:: journal_zero_on_create