From: Jos Collin <jcollin@redhat.com>
Date: Tue, 17 Feb 2026 03:04:39 +0000 (+0530)
Subject: Merge PR #65817 into wip-jcollin-testing-20260217.030412-squid
X-Git-Tag: testing/wip-jcollin-testing-20260217.030412-squid
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fwip-jcollin-testing-20260217.030412-squid;p=ceph-ci.git

Merge PR #65817 into wip-jcollin-testing-20260217.030412-squid

* refs/pull/65817/head:
	src/common: add helper to prepend "..." to trimmed paths
	mds/ScrubStack: avoid generating inode path since it is unused
	mds: fix few log entries
	client: trim path before logging it
	mds: log trimmed path wherever generating full path is necessary
	mds: for logging generate only 10 final components of dentry path
	mds: for logging generate only 10 final components of inode path
	qa, test: run unit tests for cephfs.pyx with non-root user
	test/pybind: add unit tests for rmtree() in cephfs python bindings
	pybind/cephfs, mgr/volumes: refactor purge() to be non-recursive
---

0a9403ad6667fb8ffa43f11d9a5d3062d3558d8e
diff --cc src/client/Client.cc
index 09c94e1a425,4e7e5ad2865..c43746a5640
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@@ -7702,13 -7708,8 +7709,13 @@@ int Client::path_walk(InodeRef dirinode
      int caps = 0;
      dname = path[i];
      ldout(cct, 10) << " " << i << " " << *diri << " " << dname << dendl;
-     ldout(cct, 20) << "  (path is " << path << ")" << dendl;
+     ldout(cct, 20) << "  (path is " << trimmed_path << ")" << dendl;
      InodeRef next;
 +    if (!diri.get()->is_dir()) {
 +      ldout(cct, 20) << diri.get() << " is not a dir inode, name " << dname.c_str() << dendl;
 +      rc = -ENOTDIR;
 +      goto out;
 +    }
      if (should_check_perms()) {
        int r = may_lookup(diri.get(), perms);
        if (r < 0) {