Skip to content

Commit 25bb868

Browse files
committed
Merge PR ceph#58950 into main
* refs/pull/58950/head: mds: add the event when creating the batch head mds: print the path depth to help debug mds issue Reviewed-by: Patrick Donnelly <[email protected]>
2 parents 0a05dac + 7e08760 commit 25bb868

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/mds/MDCache.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8339,7 +8339,8 @@ int MDCache::path_traverse(const MDRequestRef& mdr, MDSContextFactory& cf,
83398339

83408340
if (mds->logger) mds->logger->inc(l_mds_traverse);
83418341

8342-
dout(7) << "traverse: opening base ino " << path.get_ino() << " snap " << snapid << dendl;
8342+
dout(7) << "traverse: opening base ino " << path.get_ino() << " snap " << snapid
8343+
<< " path depth " << path.depth() << dendl;
83438344
CInode *cur = get_inode(path.get_ino());
83448345
if (!cur) {
83458346
if (MDS_INO_IS_MDSDIR(path.get_ino())) {

src/mds/Server.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4147,6 +4147,7 @@ void Server::handle_client_getattr(const MDRequestRef& mdr, bool is_lookup)
41474147
auto em = dn->batch_ops.emplace(std::piecewise_construct, std::forward_as_tuple(mask), std::forward_as_tuple());
41484148
if (em.second) {
41494149
em.first->second = std::make_unique<Batch_Getattr_Lookup>(this, mdr);
4150+
mdr->mark_event("creating lookup batch head");
41504151
} else {
41514152
dout(20) << __func__ << ": LOOKUP op, wait for previous same getattr ops to respond. " << *mdr << dendl;
41524153
em.first->second->add_request(mdr);
@@ -4159,6 +4160,7 @@ void Server::handle_client_getattr(const MDRequestRef& mdr, bool is_lookup)
41594160
auto em = in->batch_ops.emplace(std::piecewise_construct, std::forward_as_tuple(mask), std::forward_as_tuple());
41604161
if (em.second) {
41614162
em.first->second = std::make_unique<Batch_Getattr_Lookup>(this, mdr);
4163+
mdr->mark_event("creating getattr batch head");
41624164
} else {
41634165
dout(20) << __func__ << ": GETATTR op, wait for previous same getattr ops to respond. " << *mdr << dendl;
41644166
em.first->second->add_request(mdr);

0 commit comments

Comments
 (0)