From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Jul 2018 19:20:27 +0000 (-0500)
Subject: Merge PR #22534 into master
X-Git-Tag: v14.0.1~951
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b12dfc15b2672ddcc0f1a6ad74c80bc0b463b21a;p=ceph-ci.git

Merge PR #22534 into master

* refs/pull/22534/head:
	msg/Messenger: use safe_item_history<> for my_addrs
	msg/simple: fix set_myaddrs()
	msg/Messenger: use mutable_item_history<> for my_addrs
	common/item_history: container to support lockless reads, infrequent updates
	msg/simple/Accepter: fix my_addr == my_addrs.v[0] constraint
	msg/async: track target_addr for each connection
	msg/async: mark accepted connections with addr type (legacy or msgr2)
	msg/async: mark AsyncConnection with msgr2 flag
	msg/async: track connections by addrvec
	mon/Session: inst -> name and addrs
	osd/OSDMap: don't print hb addrs
	msg/DispatchQueue: myaddr -> myaddrs
	mgr: myaddr -> myaddrs
	msg: make set_addr_unknowns take an addrvec
	mon/LogMonitor: myaddr -> myaddrs
	librados: myaddr -> myaddrs
	common/LogClient: myaddr -> myaddrs
	client: myaddr -> myaddrs
	osd/OSDMap: is_blacklisted() for addrvecs
	osd: populate metadata with all addrs
	mds: addr -> addrvec
	mon/MonClient: get_myaddrs()
	mon/OSDMonitor: addrvec blacklist helper
	mds: use new pick_addresses
	ceph-osd: use new bindv()
	msg/async: bind to multiple addresses
	msg/async: (legacy) handshake using legacy addr
	msg/async: fix some debug prefixes
	msg/async: multiple listening ServerSockets
	osd/OSDMap: make cluster addrs addrvecs too
	msg/Messenger: my_addr -> my_addrs
	msg/Connection: peer_addr -> peer_addrs
	msg/msg_types: hash<> for entity_addrvec_t
	mgr/DaemonServer: use new bindv() and pick_addresses()
	msg/Messenger: new bindv() that takes an addrvec
	common/pick_address: fill in ipv4/6 and msgr1/msgr2 via config options
	common/pick_addresses: new addrvec-based pick_addresses()
	common/pick_addresses: add filtering by ipv4 and ipv6
	CEPH_MON_PORT -> CEPH_MON_PORT_LEGACY; define CEPH_MON_PORT_IANA
	osd: kill osd_heartbeat_addr option
	common/options: add addrvec option type

Reviewed-by: Ricardo Dias <rdias@suse.com>
---

b12dfc15b2672ddcc0f1a6ad74c80bc0b463b21a