From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 30 Nov 2017 15:05:14 +0000 (-0500)
Subject: mgr: disconnect unregistered service daemon when report received
X-Git-Tag: v12.2.3~104^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb21f23731027df30844236573648bca300b523e;p=ceph.git

mgr: disconnect unregistered service daemon when report received

This will allow the service daemon to reconnect and re-register
itself as a service daemon without requiring the mgr client to
subscribe to MgrStats and detect its removal.

Fixes: http://tracker.ceph.com/issues/22286
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c97cca13ab066ed2306708986ff387d903b2486a)
---

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 321a38ad534..4dc2e4270e9 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -406,6 +406,7 @@ bool DaemonServer::handle_report(MMgrReport *m)
     // themselves to be a daemon for some service.
     dout(4) << "rejecting report from non-daemon client " << m->daemon_name
 	    << dendl;
+    m->get_connection()->mark_down();
     m->put();
     return true;
   }