diff options
| author | Sage Weil <sage@inktank.com> | 2013-01-25 09:29:37 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-01-25 09:38:39 -0800 |
| commit | 5e2fab54a4fdf2f59e2b635cbddef8a5909acb7c (patch) | |
| tree | 65111736afd546ff3b3b32b80b9fd76983f8f58d /src/osd/OSD.h | |
| parent | 1bc419a7affb056540ba8f9b332b6ff9380b37af (diff) | |
| download | ceph-5e2fab54a4fdf2f59e2b635cbddef8a5909acb7c.tar.gz | |
osd: share incoming maps via Connection*, not addrs
Kill a set of parallel methods that are using the old addr/inst-based
msgr APIs, and instead use Connection handles. This is much safer and gets
us closer to killing the old msgr API.
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 23b95e89147..b4c5b8491a3 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -790,7 +790,7 @@ private: epoch_t note_peer_epoch(int p, epoch_t e); void forget_peer_epoch(int p, epoch_t e); - bool _share_map_incoming(const entity_inst_t& inst, epoch_t epoch, + bool _share_map_incoming(entity_name_t name, Connection *con, epoch_t epoch, Session *session = 0); void _share_map_outgoing(int peer, Connection *con, OSDMapRef map = OSDMapRef()); @@ -837,7 +837,6 @@ private: } MOSDMap *build_incremental_map_msg(epoch_t from, epoch_t to); - void send_incremental_map(epoch_t since, const entity_inst_t& inst, bool lazy=false); void send_incremental_map(epoch_t since, Connection *con); void send_map(MOSDMap *m, const entity_inst_t& inst, bool lazy); void send_map(MOSDMap *m, Connection *con); |