From 183deb899bc6b1b7b2a1ec639425e45786e56b01 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 4 Jan 2014 22:39:35 -0800 Subject: [PATCH] osd: do not send peering messages during init Do not send any peering messages while we are still working our way through init(). Fixes: #7093 Signed-off-by: Sage Weil (cherry picked from commit 35da8f9d80e0c6c33fb6c6e00f0bf38f1eb87d0e) Signed-off-by: Greg Farnum --- src/osd/OSD.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index c847faad8bf..7bee1b6655d 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -5987,7 +5987,8 @@ bool OSD::compat_must_dispatch_immediately(PG *pg) void OSD::dispatch_context(PG::RecoveryCtx &ctx, PG *pg, OSDMapRef curmap) { - if (service.get_osdmap()->is_up(whoami)) { + if (service.get_osdmap()->is_up(whoami) && + is_active()) { do_notifies(*ctx.notify_list, curmap); do_queries(*ctx.query_map, curmap); do_infos(*ctx.info_map, curmap); -- 2.47.3