From: Sage Weil <sage@redhat.com>
Date: Tue, 4 Sep 2018 16:29:17 +0000 (-0500)
Subject: mon/MonClient: set hostname in MMonSubscribe message
X-Git-Tag: v13.2.3~82^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03221f8dee48c70fedf5f3bc62449e5c489e7ab8;p=ceph.git

mon/MonClient: set hostname in MMonSubscribe message

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bd7e27d59bf5f0c6a58f7fe8b8ae869942d7ec35)

# Conflicts:
#	src/mon/MonClient.cc
- conflict with sub_want refactor in master
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 1ad9e50647b1..f9bda1446063 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -33,6 +33,7 @@
 #include "messages/MMonSubscribe.h"
 #include "messages/MMonSubscribeAck.h"
 #include "common/errno.h"
+#include "common/hostname.h"
 #include "common/LogClient.h"
 
 #include "MonClient.h"
@@ -857,6 +858,7 @@ void MonClient::_renew_subs()
 
     MMonSubscribe *m = new MMonSubscribe;
     m->what = sub_new;
+    m->hostname = ceph_get_short_hostname();
     _send_mon_message(m);
 
     // update sub_sent with sub_new