From: Kefu Chai Date: Wed, 28 Jun 2017 06:39:09 +0000 (+0800) Subject: doc: update with "mon priority" related changes X-Git-Tag: v12.1.1~188^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42c822dccf44df74a751922de9e67d3d7490fd69;p=ceph.git 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 --- diff --git a/doc/rados/configuration/mon-lookup-dns.rst b/doc/rados/configuration/mon-lookup-dns.rst index 9aa1d37396e..e32b3206ad8 100644 --- 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 910637afe9d..d2b367701e7 100644 --- 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``