]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Revert "mon/MonMap: no noname- mon name prefix when for_mkfs"
authorSage Weil <sage@redhat.com>
Wed, 9 Jan 2019 22:04:11 +0000 (16:04 -0600)
committerSage Weil <sage@redhat.com>
Fri, 11 Jan 2019 01:00:39 +0000 (19:00 -0600)
commit9bfd5bd322fab60758b2d860b8467323174da4e5
treef2bca26dd6eb3fb77b52674c4c1e7d495df37303
parent0368fbd851806e7ab53681cd1da2acdae35a6f59
Revert "mon/MonMap: no noname- mon name prefix when for_mkfs"

This reverts commit c078c810313ece647db6d9056c0eca5256a91a34.

# Conflicts:
# src/mon/MonMap.cc

The ceph_mon.cc bootstrap code expects a noname- prefix to identify which
unamed mons (i.e., generated from mon_host) in the initial monmap can be
taken over as itself.

At the same time, the mon recovery code needs a way to know how to name
the monitors.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/MonMap.cc