RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26449 from tchaikov/wip-monc-cleanup

Browse Source 
mon/MonClient: drop my_addr

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Kefu Chai 2019-02-16 23:16:09 +08:00 committed by GitHub
commit e062432902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mgr/MgrStandby.cc
View File

@ -216,7 +216,8 @@ void MgrStandby::send_beacon()
dout(10) << "sending beacon as gid " << monc.get_global_id() << dendl;
map<string,string> metadata;
metadata["addr"] = monc.get_my_addr().ip_only_to_str();
#warning fixme, report addrs instead
metadata["addr"] = client_messenger->get_myaddr_legacy().ip_only_to_str();
collect_sys_info(&metadata, g_ceph_context);
MMgrBeacon *m = new MMgrBeacon(monc.get_fsid(),

4
src/mon/MonClient.cc
View File

@ -271,10 +271,6 @@ int MonClient::ping_monitor(const string &mon_id, string *result_reply)
bool MonClient::ms_dispatch(Message *m)
{
#warning fixme, my_addr should be entity_addrvec_t my_addrs
if (my_addr == entity_addr_t())
my_addr = messenger->get_myaddr_legacy();
// we only care about these message types
switch (m->get_type()) {
case CEPH_MSG_MON_MAP:

6
src/mon/MonClient.h
View File

@ -246,8 +246,6 @@ private:
EntityName entity_name;
entity_addr_t my_addr;
mutable Mutex monc_lock;
SafeTimer timer;
Finisher finisher;
@ -467,10 +465,6 @@ public:
_reopen_session();
}
entity_addr_t get_my_addr() const {
return my_addr;
}
const uuid_d& get_fsid() const {
return monmap.fsid;
}