osd: rebind heartbeat_messenger (with cluster one) when wrongly marked down

This keeps things clean.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d0e9dc6d417a60c1aefb9cec03a03f9d29f4b26f..93ec717d9529c4843a13161fc08f036f94b5ae50 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2754,7 +2754,14 @@ void OSD::handle_osd_map(MOSDMap *m)
       state = STATE_BOOTING;
       up_epoch = 0;
 
-      int r = cluster_messenger->rebind();
+      int cport = cluster_messenger->get_myaddr().get_port();
+      int hbport = heartbeat_messenger->get_myaddr().get_port();
+
+      int r = cluster_messenger->rebind(hbport);
+      if (r != 0)
+       do_shutdown = true;  // FIXME: do_restart?
+
+      r = heartbeat_messenger->rebind(cport);
       if (r != 0)
        do_shutdown = true;  // FIXME: do_restart?