Merge pull request ceph#57859 from vshankar/wip-debug-reclaim-noaddrs

vshankar · web-flow · commit e60cb05c05a7 · 2024-07-15T15:24:09.000+05:30
mds: derr log and dump sessionmap when reclaim session uuid isn't found

Reviewed-by: Patrick Donnelly &lt;pdonnell@redhat.com&gt;
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
@@ -472,6 +472,9 @@ void Server::reclaim_session(Session *session, const cref_t<MClientReclaim> &m)
     ceph_assert(!session->reclaiming_from);
     session->reclaiming_from = target;
     reply->set_addrs(entity_addrvec_t(target->info.inst.addr));
+  } else {
+    derr << ": could not find session by uuid:" << m->get_uuid() << dendl;
+    mds->sessionmap.dump();
   }
 
   if (flags & CEPH_RECLAIM_RESET) {
diff --git a/src/messages/MClientReclaimReply.h b/src/messages/MClientReclaimReply.h
@@ -32,7 +32,8 @@ class MClientReclaimReply final : public SafeMessage {
 
   std::string_view get_type_name() const override { return "client_reclaim_reply"; }
   void print(std::ostream& o) const override {
-    o << "client_reclaim_reply(" << result << " e " << epoch << ")";
+    o << "client_reclaim_reply(" << result << " e " << epoch
+      << " addrs " << addrs << ")";
   }
 
   void encode_payload(uint64_t features) override {

Original file line number	Diff line number	Diff line change
`@@ -472,6 +472,9 @@ void Server::reclaim_session(Session *session, const cref_t<MClientReclaim> &m)`
`472`	`472`	`ceph_assert(!session->reclaiming_from);`
`473`	`473`	`session->reclaiming_from = target;`
`474`	`474`	`reply->set_addrs(entity_addrvec_t(target->info.inst.addr));`
	`475`	`+ } else {`
	`476`	`+ derr << ": could not find session by uuid:" << m->get_uuid() << dendl;`
	`477`	`+ mds->sessionmap.dump();`
`475`	`478`	`}`
`476`	`479`
`477`	`480`	`if (flags & CEPH_RECLAIM_RESET) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ class MClientReclaimReply final : public SafeMessage {`
`32`	`32`
`33`	`33`	`std::string_view get_type_name() const override { return "client_reclaim_reply"; }`
`34`	`34`	`void print(std::ostream& o) const override {`
`35`		`- o << "client_reclaim_reply(" << result << " e " << epoch << ")";`
	`35`	`+ o << "client_reclaim_reply(" << result << " e " << epoch`
	`36`	`+ << " addrs " << addrs << ")";`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`void encode_payload(uint64_t features) override {`