From afefd737ca8a737dfcad5b50b99862228b1ce531 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 14 Jan 2011 16:58:47 -0800 Subject: [PATCH] osd: rebind heartbeat_messenger (with cluster one) when wrongly marked down This keeps things clean. Signed-off-by: Sage Weil --- src/osd/OSD.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index d0e9dc6d417a6..93ec717d9529c 100644 --- 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? -- 2.39.5