Merge PR #26885 into master

* refs/pull/26885/head:
	doc/releases/nautilus: add msgr2 refs

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2019-03-11 15:36:34 -05:00
commit 29ec97d915
4 changed files with 10 additions and 4 deletions

View File

@ -60,7 +60,7 @@ Context
The authentication messages described here are specific to the cephx
auth implementation. The messages are transferred by the Messenger
protocol or by MAuth messages, depending on the version of the
messenger protocol. See also :ref:`msgr2`.
messenger protocol. See also :ref:`msgr2-protocol`.
An initial (messenger) handshake negotiates an authentication method
to be used (cephx vs none or krb or whatever) and an assertion of what

View File

@ -1,4 +1,4 @@
.. _msgr2:
.. _msgr2-protocol:
msgr2 protocol
==============

View File

@ -1,3 +1,5 @@
.. _msgr2:
Messenger v2
============
@ -216,4 +218,7 @@ the monitors' configuration database) may be helpful. For example,::
mon_host = [v2:10.0.0.1:3300/0,v1:10.0.0.1:6789/0]
# mv /etc/ceph/ceph.conf.new /etc/ceph/ceph.conf
Protocol
--------
For a detailed description of the v2 wire protocol, see :ref:`msgr2-protocol`.

View File

@ -47,7 +47,7 @@ Major Changes from Mimic
* The number of placement groups (PGs) per pool can now be decreased
at any time, and the cluster can automatically tune the PG count
based on cluster utilization or administrator hints.
* The new *v2* wire protocol brings support for encryption on the wire.
* The new :ref:`v2 wire protocol <msgr2>` brings support for encryption on the wire.
* Physical storage devices consumed by OSD and Monitor daemons are
now tracked by the cluster along with health metrics (i.e.,
SMART), and the cluster can apply a pre-trained prediction model
@ -273,7 +273,8 @@ Instructions
#. Verify the cluster is healthy with ``ceph health``.
#. To enable the new v2 network protocol, issue the following command::
#. To enable the new :ref:`v2 network protocol <msgr2>`, issue the
following command::
ceph mon enable-msgr2