]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MonClient: set hostname in MMonSubscribe message
authorSage Weil <sage@redhat.com>
Tue, 4 Sep 2018 16:29:17 +0000 (11:29 -0500)
committerSage Weil <sage@redhat.com>
Tue, 4 Sep 2018 16:29:17 +0000 (11:29 -0500)
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

src/mon/MonClient.cc

index 1ad9e50647b166ee3bfad4fb9949823b4d173f72..f9bda1446063ea0a51f96d5732d453ff6425a3ed 100644 (file)
@@ -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