mgr: kill MgrSession when MMgrReport come from daemon without metadata info

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit 29080134339e5e64d50af1db9fe50df7ea55c1d0)

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 321a38ad5349496154d1b4c6338e98fef52f0338..e612086ad3ec262b158b40ba42673b7b020ecb3c 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -416,14 +416,18 @@ bool DaemonServer::handle_report(MMgrReport *m)
     dout(20) << "updating existing DaemonState for " << key << dendl;
     daemon = daemon_state.get(key);
   } else {
-    dout(4) << "constructing new DaemonState for " << key << dendl;
-    daemon = std::make_shared<DaemonState>(daemon_state.types);
-    // FIXME: crap, we don't know the hostname at this stage.
-    daemon->key = key;
-    daemon_state.insert(daemon);
-    // FIXME: we should avoid this case by rejecting MMgrReport from
-    // daemons without sessions, and ensuring that session open
-    // always contains metadata.
+    // we don't know the hostname at this stage, reject MMgrReport here.
+    dout(1) << "rejecting report from " << key << ", since we do not have its metadata now."
+           << dendl;
+    // kill session
+    MgrSessionRef session(static_cast<MgrSession*>(m->get_connection()->get_priv()));
+    if (!session) {
+      return false;
+    }
+    m->get_connection()->mark_down();
+    session->put();
+
+    return false;
   }
 
   // Update the DaemonState

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 2ed89636f6b9139c1d0a8e5814911f6446c6d523..7615bd647cd1f549bd3020d59769ac63ca6d2f10 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -412,7 +412,7 @@ void Mgr::handle_osd_map()
    * reload the metadata.
    */
   objecter->with_osdmap([this, &names_exist](const OSDMap &osd_map) {
-    for (unsigned int osd_id = 0; osd_id < osd_map.get_num_osds(); ++osd_id) {
+    for (unsigned int osd_id = 0; osd_id < osd_map.get_max_osd(); ++osd_id) {
       if (!osd_map.exists(osd_id)) {
         continue;
       }