]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: do not send peering messages during init
authorSage Weil <sage@inktank.com>
Sun, 5 Jan 2014 06:39:35 +0000 (22:39 -0800)
committerSage Weil <sage@inktank.com>
Sun, 5 Jan 2014 06:44:56 +0000 (22:44 -0800)
Do not send any peering messages while we are still working our way
through init().

Fixes: #7093
Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/OSD.cc

index 9a22e9124dacef1663803fafe3c43048ea1eeac3..9622020d9b074f7ce9269596980e502a5219f7c3 100644 (file)
@@ -6062,7 +6062,8 @@ bool OSD::compat_must_dispatch_immediately(PG *pg)
 void OSD::dispatch_context(PG::RecoveryCtx &ctx, PG *pg, OSDMapRef curmap,
                            ThreadPool::TPHandle *handle)
 {
-  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);