doc: update with "mon priority" related changes

* doc/rados/configuration/mon-lookup-dns.rst
  we now partially support RFC2782: only the targets with the lowest
  value are selected
* doc/rados/configuration/network-config-ref.rst
  update with "mon priority" option in "[mon.$id]" section

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/doc/rados/configuration/mon-lookup-dns.rst b/doc/rados/configuration/mon-lookup-dns.rst
index 9aa1d37396e9661521df1ab2c9e86985045ca177..e32b3206ad8726d0150195edfd9af083fbe026da 100644 (file)
--- a/doc/rados/configuration/mon-lookup-dns.rst
+++ b/doc/rados/configuration/mon-lookup-dns.rst
@@ -46,8 +46,6 @@ With those records now existing we can create the SRV TCP records with the name
     _ceph-mon._tcp.example.com. 60 IN SRV 10 60 6789 mon2.example.com.
     _ceph-mon._tcp.example.com. 60 IN SRV 10 60 6789 mon3.example.com.
 
-In this case the Monitors are running on port *6789*.
+In this case the Monitors are running on port *6789*, and their priority and weight are all *10* and *60* respectively.
 
-The current implementation in clients and daemons does *not* honor nor respect the weight or priority set in SRV records.
-
-All records returned will be treated equally in a Round Robin fashion.
+The current implementation in clients and daemons will *only* respect the priority set in SRV records, and they will only connect to the monitors with lowest-numbered priority. The targets with the same priority will be selected at random.

diff --git a/doc/rados/configuration/network-config-ref.rst b/doc/rados/configuration/network-config-ref.rst
index 910637afe9d34bf44294ed4b5dc7c659985a1126..d2b367701e74ac1fb4b65ea92c366ba22b4c1c24 100644 (file)
--- a/doc/rados/configuration/network-config-ref.rst
+++ b/doc/rados/configuration/network-config-ref.rst
@@ -383,7 +383,9 @@ Hosts
 Ceph expects at least one monitor declared in the Ceph configuration file, with
 a ``mon addr`` setting under each declared monitor. Ceph expects a ``host``
 setting under each declared monitor, metadata server and OSD in the Ceph
-configuration file.
+configuration file. Optionally, a monitor can be assigned with a priority, and
+the clients will always connect to the monitor with lower value of priority if
+specified.
 
 
 ``mon addr``
@@ -396,6 +398,15 @@ configuration file.
 :Required: No
 :Default: N/A
 
+``mon priority``
+
+:Description: The priority of the declared monitor, the lower value the more
+              prefered when a client selects a monitor when trying to connect
+              to the cluster.
+
+:Type: Unsigned 16-bit Integer
+:Required: No
+:Default: 0
 
 ``host``