From: Sage Weil <sage@redhat.com>
Date: Thu, 15 Mar 2018 13:32:14 +0000 (-0500)
Subject: osd: debug dispatch_context cases where queries not sent
X-Git-Tag: v13.0.2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85f980223db811a8ab423354243725fa8f735f9f;p=ceph.git

osd: debug dispatch_context cases where queries not sent

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2babb4e289af..6d514e5c4487 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8316,8 +8316,11 @@ void OSD::dispatch_context_transaction(PG::RecoveryCtx &ctx, PG *pg,
 void OSD::dispatch_context(PG::RecoveryCtx &ctx, PG *pg, OSDMapRef curmap,
                            ThreadPool::TPHandle *handle)
 {
-  if (service.get_osdmap()->is_up(whoami) &&
-      is_active()) {
+  if (!service.get_osdmap()->is_up(whoami)) {
+    dout(20) << __func__ << " not up in osdmap" << dendl;
+  } else if (!is_active()) {
+    dout(20) << __func__ << " not active" << dendl;
+  } else {
     do_notifies(*ctx.notify_list, curmap);
     do_queries(*ctx.query_map, curmap);
     do_infos(*ctx.info_map, curmap);