From 61c4c1c99bca7db4f743ee3c2612c5dd425dfd3d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 Apr 2016 08:48:25 -0400 Subject: [PATCH] doc: list ext4 last Signed-off-by: Sage Weil --- doc/dev/index.rst | 13 +++++++------ doc/dev/object-store.rst | 4 ++-- doc/rados/troubleshooting/troubleshooting-osd.rst | 4 ++-- doc/rbd/qemu-rbd.rst | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/dev/index.rst b/doc/dev/index.rst index abd06371699..7a5ce68af9c 100644 --- a/doc/dev/index.rst +++ b/doc/dev/index.rst @@ -1096,7 +1096,7 @@ Reducing the number of tests The ``rados`` suite generates thousands of tests out of a few hundred files. For instance, all tests in the `rados/thrash suite `_ -run for ``ext4``, ``xfs`` and ``btrfs`` because they are combined (via +run for ``xfs``, ``btrfs`` and ``ext4`` because they are combined (via special file ``%``) with the `fs directory `_ @@ -1107,11 +1107,12 @@ reduce the number of tests that are triggered. For instance:: teuthology-suite --suite rados --subset 0/4000 -will run as few tests as possible. The tradeoff in this case is that some tests -will only run on ``ext4`` and not on ``btrfs``, but no matter how small a -ratio is provided in the ``--subset``, teuthology will still ensure that -all files in the suite are in at least one test. Understanding the actual -logic that drives this requires reading the teuthology source code. +will run as few tests as possible. The tradeoff in this case is that +some tests will only run on ``xfs`` and not on ``ext4`` or ``btrfs``, +but no matter how small a ratio is provided in the ``--subset``, +teuthology will still ensure that all files in the suite are in at +least one test. Understanding the actual logic that drives this +requires reading the teuthology source code. The ``--limit`` option only runs the first ``N`` tests in the suite: this is rarely useful, however, because there is no way to control which diff --git a/doc/dev/object-store.rst b/doc/dev/object-store.rst index e3771f9c18e..8aca54fa620 100644 --- a/doc/dev/object-store.rst +++ b/doc/dev/object-store.rst @@ -58,9 +58,9 @@ "ObjectStore" -> "FileStore" - "FileStore" -> "ext3" - "FileStore" -> "ext4" + "FileStore" -> "xfs" "FileStore" -> "btrfs" + "FileStore" -> "ext4" } diff --git a/doc/rados/troubleshooting/troubleshooting-osd.rst b/doc/rados/troubleshooting/troubleshooting-osd.rst index e1fb30e8320..df95c83dfb5 100644 --- a/doc/rados/troubleshooting/troubleshooting-osd.rst +++ b/doc/rados/troubleshooting/troubleshooting-osd.rst @@ -288,8 +288,8 @@ write throughput can bottleneck if other processes share the drive, including journals, operating systems, monitors, other OSDs and non-Ceph processes. Ceph acknowledges writes *after* journaling, so fast SSDs are an attractive -option to accelerate the response time--particularly when using the ``ext4`` or -XFS filesystems. By contrast, the ``btrfs`` filesystem can write and journal +option to accelerate the response time--particularly when using the ``XFS`` or +``ext4`` filesystems. By contrast, the ``btrfs`` filesystem can write and journal simultaneously. .. note:: Partitioning a drive does not change its total throughput or diff --git a/doc/rbd/qemu-rbd.rst b/doc/rbd/qemu-rbd.rst index cec04ac2fc4..e771acd8b70 100644 --- a/doc/rbd/qemu-rbd.rst +++ b/doc/rbd/qemu-rbd.rst @@ -154,7 +154,7 @@ Enabling Discard/TRIM Since Ceph version 0.46 and QEMU version 1.1, Ceph Block Devices support the discard operation. This means that a guest can send TRIM requests to let a Ceph block device reclaim unused space. This can be enabled in the guest by mounting -``ext4`` or XFS with the ``discard`` option. +``ext4`` or ``XFS`` with the ``discard`` option. For this to be available to the guest, it must be explicitly enabled for the block device. To do this, you must specify a @@ -215,4 +215,4 @@ QEMU command line settings override the Ceph configuration file settings. .. _RBD Cache: ../rbd-config-ref/ .. _Snapshots: ../rbd-snapshot/ .. _Installation: ../../install -.. _User Management - User: ../../rados/operations/user-management#user \ No newline at end of file +.. _User Management - User: ../../rados/operations/user-management#user -- 2.39.5