doc: update Hadoop documentation

Updates configuration option names, and adds object.size,
localize.reads, and root.dir control options.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/doc/cephfs/hadoop.rst b/doc/cephfs/hadoop.rst
index a98c92f0c2a777a4a2fc394ceb9e1554d8905ea0..7481b7f0d8a92c1fae2e59250f9cad4d111a6804 100644 (file)
--- a/doc/cephfs/hadoop.rst
+++ b/doc/cephfs/hadoop.rst
@@ -1,6 +1,6 @@
-=========================
- Using Hadoop with CephFS
-=========================
+========================
+Using Hadoop with CephFS
+========================
 
 Hadoop Configuration
 --------------------
@@ -9,31 +9,35 @@ This section describes the Hadoop configuration options used to control Ceph.
 These options are intended to be set in the Hadoop configuration file
 `conf/core-site.xml`.
 
-+--------------------+--------------------------+----------------------------+
-|Property            |Value                     |Notes                       |
-|                    |                          |                            |
-+====================+==========================+============================+
-|fs.default.name     |Ceph URI                  |ceph:///                    |
-|                    |                          |                            |
-|                    |                          |                            |
-+--------------------+--------------------------+----------------------------+
-|fs.ceph.conf.file   |Local path to ceph.conf   |/etc/ceph/ceph.conf         |
-|                    |                          |                            |
-|                    |                          |                            |
-|                    |                          |                            |
-+--------------------+--------------------------+----------------------------+
-|fs.ceph.conf.options|Comma separated list of   |opt1=val1,opt2=val2         |
-|                    |key/value pairs           |                            |
-|                    |                          |                            |
-|                    |                          |                            |
-+--------------------+--------------------------+----------------------------+
-|fs.ceph.block.size  |Default file block size   |Default value: 67108864     |
-|                    |in bytes                  |                            |
-|                    |                          |                            |
-|                    |                          |                            |
-+--------------------+--------------------------+----------------------------+
-|fs.ceph.replication |Default file replication  |Default value: 3            |
-|                    |factor                    |                            |
-|                    |                          |                            |
-|                    |                          |                            |
-+--------------------+--------------------------+----------------------------+
++---------------------+--------------------------+----------------------------+
+|Property             |Value                     |Notes                       |
+|                     |                          |                            |
++=====================+==========================+============================+
+|fs.default.name      |Ceph URI                  |ceph:///                    |
+|                     |                          |                            |
+|                     |                          |                            |
++---------------------+--------------------------+----------------------------+
+|ceph.conf.file       |Local path to ceph.conf   |/etc/ceph/ceph.conf         |
+|                     |                          |                            |
+|                     |                          |                            |
+|                     |                          |                            |
++---------------------+--------------------------+----------------------------+
+|ceph.conf.options    |Comma separated list of   |opt1=val1,opt2=val2         |
+|                     |Ceph configuration        |                            |
+|                     |key/value pairs           |                            |
+|                     |                          |                            |
++---------------------+--------------------------+----------------------------+
+|ceph.root.dir        |Mount root directory      |Default value: /            |
+|                     |                          |                            |
+|                     |                          |                            |
++---------------------+--------------------------+----------------------------+
+|ceph.object.size     |Default file object size  |Default value (64MB):       |
+|                     |in bytes                  |67108864                    |
+|                     |                          |                            |
+|                     |                          |                            |
++---------------------+--------------------------+----------------------------+
+|ceph.localize.reads  |Allow reading from file   |Default value: true         |
+|                     |replica objects           |                            |
+|                     |                          |                            |
+|                     |                          |                            |
++---------------------+--------------------------+----------------------------+