mgr/MgrClient: implement con reset handling

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index d1bd51d441e624728514103675ec0fa989f9ca19..070de31c8e1f6db6993c9a9fc5289f3c88ee2570 100644 (file)
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -77,6 +77,60 @@ bool MgrClient::ms_dispatch(Message *m)
   }
 }
 
+void MgrClient::reconnect()
+{
+  assert(lock.is_locked_by_me());
+
+  if (session) {
+    ldout(cct, 4) << "Terminating session with "
+                 << session->con->get_peer_addr() << dendl;
+    session->con->mark_down();
+    delete session;
+    session = nullptr;
+    stats_period = 0;
+    if (report_callback != nullptr) {
+      timer.cancel_event(report_callback);
+      report_callback = nullptr;
+    }
+
+    std::vector<ceph_tid_t> erase_cmds;
+    auto commands = command_table.get_commands();
+    for (const auto &i : commands) {
+      // FIXME be nicer, retarget command on new mgr?
+      if (i.second.on_finish != nullptr) {
+       i.second.on_finish->complete(-ETIMEDOUT);
+      }
+      erase_cmds.push_back(i.first);
+    }
+    for (const auto &tid : erase_cmds) {
+      command_table.erase(tid);
+    }
+  }
+
+  if (map.get_available()) {
+    ldout(cct, 4) << "Starting new session with " << map.get_active_addr()
+                 << dendl;
+    entity_inst_t inst;
+    inst.addr = map.get_active_addr();
+    inst.name = entity_name_t::MGR(map.get_active_gid());
+
+    session = new MgrSessionState();
+    session->con = msgr->get_connection(inst);
+
+    // Don't send an open if we're just a client (i.e. doing
+    // command-sending, not stats etc)
+    if (g_conf && !g_conf->name.is_client()) {
+      auto open = new MMgrOpen();
+      open->daemon_name = g_conf->name.get_id();
+      session->con->send_message(open);
+    }
+
+    signal_cond_list(waiting_for_session);
+  } else {
+    ldout(cct, 4) << "No active mgr available yet" << dendl;
+  }
+}
+
 bool MgrClient::handle_mgr_map(MMgrMap *m)
 {
   assert(lock.is_locked_by_me());
@@ -92,55 +146,7 @@ bool MgrClient::handle_mgr_map(MMgrMap *m)
   // Reset session?
   if (session == nullptr || 
       session->con->get_peer_addr() != map.get_active_addr()) {
-
-    if (session) {
-      ldout(cct, 4) << "Terminating session with "
-                    << session->con->get_peer_addr() << dendl;
-      session->con->mark_down();
-      delete session;
-      session = nullptr;
-      stats_period = 0;
-      if (report_callback != nullptr) {
-        timer.cancel_event(report_callback);
-        report_callback = nullptr;
-      }
-
-      std::vector<ceph_tid_t> erase_cmds;
-      auto commands = command_table.get_commands();
-      for (const auto &i : commands) {
-        // FIXME be nicer, retarget command on new mgr?
-        if (i.second.on_finish != nullptr) {
-          i.second.on_finish->complete(-ETIMEDOUT);
-        }
-        erase_cmds.push_back(i.first);
-      }
-      for (const auto &tid : erase_cmds) {
-        command_table.erase(tid);
-      }
-    }
-
-    if (map.get_available()) {
-      ldout(cct, 4) << "Starting new session with " << map.get_active_addr()
-                    << dendl;
-      entity_inst_t inst;
-      inst.addr = map.get_active_addr();
-      inst.name = entity_name_t::MGR(map.get_active_gid());
-
-      session = new MgrSessionState();
-      session->con = msgr->get_connection(inst);
-
-      // Don't send an open if we're just a client (i.e. doing
-      // command-sending, not stats etc)
-      if (g_conf && !g_conf->name.is_client()) {
-        auto open = new MMgrOpen();
-        open->daemon_name = g_conf->name.get_id();
-        session->con->send_message(open);
-      }
-
-      signal_cond_list(waiting_for_session);
-    } else {
-      ldout(cct, 4) << "No active mgr available yet" << dendl;
-    }
+    reconnect();
   }
 
   return true;
@@ -148,26 +154,13 @@ bool MgrClient::handle_mgr_map(MMgrMap *m)
 
 bool MgrClient::ms_handle_reset(Connection *con)
 {
-#if 0
-  Mutex::Locker lock(monc_lock);
-
-  if (con->get_peer_type() == CEPH_ENTITY_TYPE_MON) {
-    if (cur_mon.empty() || con != cur_con) {
-      ldout(cct, 10) << "ms_handle_reset stray mon " << con->get_peer_addr() << dendl;
-      return true;
-    } else {
-      ldout(cct, 10) << "ms_handle_reset current mon " << con->get_peer_addr() << dendl;
-      if (hunting)
-       return true;
-      
-      ldout(cct, 0) << "hunting for new mon" << dendl;
-      _reopen_session();
-    }
+  Mutex::Locker l(lock);
+  if (session && con == session->con) {
+    ldout(cct, 4) << __func__ << " con " << con << dendl;
+    reconnect();
+    return true;
   }
   return false;
-#else
-  return false;
-#endif
 }
 
 bool MgrClient::ms_handle_refused(Connection *con)

diff --git a/src/mgr/MgrClient.h b/src/mgr/MgrClient.h
index 80cedf0f412970d70c6e6824eb8f0e3b7fc7256d..e18c2c0940d6c6eb511eeced4eee10f503008e0e 100644 (file)
--- a/src/mgr/MgrClient.h
+++ b/src/mgr/MgrClient.h
@@ -73,6 +73,8 @@ protected:
   // our reports (hook for use by OSD)
   std::function<MPGStats*()> pgstats_cb;
 
+  void reconnect();
+
 public:
   MgrClient(CephContext *cct_, Messenger *msgr_);