]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: disconnect unregistered service daemon when report received 19261/head
authorJason Dillaman <dillaman@redhat.com>
Thu, 30 Nov 2017 15:05:14 +0000 (10:05 -0500)
committerJason Dillaman <dillaman@redhat.com>
Thu, 30 Nov 2017 15:05:14 +0000 (10:05 -0500)
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>
src/mgr/DaemonServer.cc

index 2fe220b50b38a4e5a29fa433c79cf8d922604e80..dbffb3f75181f2f62e60cb945ef1422e1d5241b0 100644 (file)
@@ -410,6 +410,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;
   }