diff options
| author | Kefu Chai <tchaikov@gmail.com> | 2019-02-16 16:16:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 16:16:09 +0100 |
| commit | e0624329023b5be75dbbc6dc2cd60fdcbaee5ea8 (patch) | |
| tree | c9de558ea57ac27a1138d43ecab12ab889a4d626 /src/mgr | |
| parent | Merge PR #26455 into master (diff) | |
| parent | mon/MonClient: drop my_addr (diff) | |
| download | ceph-e0624329023b5be75dbbc6dc2cd60fdcbaee5ea8.tar.xz ceph-e0624329023b5be75dbbc6dc2cd60fdcbaee5ea8.zip | |
Merge pull request #26449 from tchaikov/wip-monc-cleanup
mon/MonClient: drop my_addr
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Diffstat (limited to 'src/mgr')
| -rw-r--r-- | src/mgr/MgrStandby.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc index f055ce28837..a2767be7abd 100644 --- a/src/mgr/MgrStandby.cc +++ b/src/mgr/MgrStandby.cc @@ -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(), |