osd: move heartbeat connection cleanup to helper

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 61fef2a6208aee296ec4886fd89bf591ccf631f2..b76c9f052108b3f8f178498126719c25bf358486 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4394,12 +4394,7 @@ void OSD::_remove_heartbeat_peer(int n)
           << " " << q->second.con_back->get_peer_addr()
           << " " << (q->second.con_front ? q->second.con_front->get_peer_addr() : entity_addr_t())
           << dendl;
-  q->second.con_back->mark_down();
-  q->second.con_back->clear_priv();
-  if (q->second.con_front) {
-    q->second.con_front->mark_down();
-    q->second.con_front->clear_priv();
-  }
+  q->second.clear_mark_down();
   heartbeat_peers.erase(q);
 }
 
@@ -4528,12 +4523,7 @@ void OSD::reset_heartbeat_peers(bool all)
   for (auto it = heartbeat_peers.begin(); it != heartbeat_peers.end();) {
     HeartbeatInfo& hi = it->second;
     if (all || hi.is_stale(stale)) {
-      hi.con_back->mark_down();
-      hi.con_back->clear_priv();
-      if (hi.con_front) {
-        hi.con_front->mark_down();
-       hi.con_front->clear_priv();
-      }
+      hi.clear_mark_down();
       // stop sending failure_report to mon too
       failure_queue.erase(it->first);
       heartbeat_peers.erase(it++);
@@ -4950,16 +4940,7 @@ bool OSD::heartbeat_reset(Connection *con)
         p->second.con_front == con)) {
       dout(10) << "heartbeat_reset failed hb con " << con << " for osd." << p->second.peer
               << ", reopening" << dendl;
-      if (con != p->second.con_back) {
-       p->second.con_back->mark_down();
-       p->second.con_back->clear_priv();
-      }
-      p->second.con_back.reset(NULL);
-      if (p->second.con_front && con != p->second.con_front) {
-       p->second.con_front->mark_down();
-       p->second.con_front->clear_priv();
-      }
-      p->second.con_front.reset(NULL);
+      p->second.clear_mark_down(con);
       pair<ConnectionRef,ConnectionRef> newcon = service.get_con_osd_hb(p->second.peer, p->second.epoch);
       if (newcon.first) {
        p->second.con_back = newcon.first.get();
@@ -7578,12 +7559,7 @@ void OSD::note_down_osd(int peer)
   failure_pending.erase(peer);
   map<int,HeartbeatInfo>::iterator p = heartbeat_peers.find(peer);
   if (p != heartbeat_peers.end()) {
-    p->second.con_back->mark_down();
-    p->second.con_back->clear_priv();
-    if (p->second.con_front) {
-      p->second.con_front->mark_down();
-      p->second.con_front->clear_priv();
-    }
+    p->second.clear_mark_down();
     heartbeat_peers.erase(p);
   }
 }

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 5b2a5f21078a2d5b575de78fdeb7bbdc0f968065..000132d2348aa34fcd4003208671ba81da0b15b3 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1444,6 +1444,19 @@ private:
       }
       return !is_unhealthy(now);
     }
+
+    void clear_mark_down(Connection *except = nullptr) {
+      if (con_back && con_back != except) {
+       con_back->mark_down();
+       con_back->clear_priv();
+       con_back.reset(nullptr);
+      }
+      if (con_front && con_front != except) {
+       con_front->mark_down();
+       con_front->clear_priv();
+       con_front.reset(nullptr);
+      }
+    }
   };
 
   ceph::mutex heartbeat_lock = ceph::make_mutex("OSD::heartbeat_lock");