summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2018-08-29 15:20:59 +0200
committerSage Weil <sage@redhat.com>2018-08-30 15:51:04 +0200
commit0acb5cb4544b2a6dc93e9afe0228167e65d49d5a (patch)
treebaa2b1103d8e20e3b8fc0200492a5dfde5304163 /src
parentcommon/util: pass real hostname when running in kubernetes/rook container (diff)
downloadceph-0acb5cb4544b2a6dc93e9afe0228167e65d49d5a.tar.xz
ceph-0acb5cb4544b2a6dc93e9afe0228167e65d49d5a.zip
mon: pay attention to MMonSubscribe's hostname
We weren't populating remote_host anywhere! Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/mon/Monitor.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 08635a49cb4..9b09d810112 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -4795,6 +4795,10 @@ void Monitor::handle_subscribe(MonOpRequestRef op)
MonSession *s = op->get_session();
ceph_assert(s);
+ if (m->hostname.size()) {
+ s->remote_host = m->hostname;
+ }
+
for (map<string,ceph_mon_subscribe_item>::iterator p = m->what.begin();
p != m->what.end();
++p) {