]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mount.ceph: collect v2 addresses for non-legacy ms_mode options 39133/head
authorJeff Layton <jlayton@redhat.com>
Wed, 6 Jan 2021 14:30:13 +0000 (09:30 -0500)
committerNathan Cutler <ncutler@suse.com>
Thu, 28 Jan 2021 12:54:40 +0000 (13:54 +0100)
commit963cafe673af8ea8c2d9131b6c199ad8117d8453
treec3815a28d82e50618d936df707bae24ee22307ee
parent9743ed991c7282b299a36c28d635ff251bdee338
mount.ceph: collect v2 addresses for non-legacy ms_mode options

The kclient recently had support for msgr2 merged, and with that we have
a new ms_mode mount option. The mount helper's support for autodiscovery
of mons currently always ignores v2 addresses.

Change the helper to look for the ms_mode in the provided options and if
it's set to anything but "legacy", have it collect v2 addresses instead
of v1 addrs. The default is still "legacy" so if the option is not
provided, we will still collect v1 addrs.

Fixes: https://tracker.ceph.com/issues/48765
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 50da7ad7f0a5b75314c51ca4f4c1f2c013c0e8b8)
src/mount/conf.cc
src/mount/mount.ceph.c
src/mount/mount.ceph.h