Skip to content

Commit 38d4640

Browse files
lxbszidryomov
authored andcommitted
ceph: print cluster fsid and client global_id in all debug logs
Multiple CephFS mounts on a host is increasingly common so disambiguating messages like this is necessary and will make it easier to debug issues. At the same this will improve the debug logs to make them easier to troubleshooting issues, such as print the ino# instead only printing the memory addresses of the corresponding inodes and print the dentry names instead of the corresponding memory addresses for the dentry,etc. Link: https://tracker.ceph.com/issues/61590 Signed-off-by: Xiubo Li <xiubli@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Milind Changire <mchangir@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent 5995d90 commit 38d4640

19 files changed

Lines changed: 1747 additions & 1312 deletions

fs/ceph/acl.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/slab.h>
1616

1717
#include "super.h"
18+
#include "mds_client.h"
1819

1920
static inline void ceph_set_cached_acl(struct inode *inode,
2021
int type, struct posix_acl *acl)
@@ -31,6 +32,7 @@ static inline void ceph_set_cached_acl(struct inode *inode,
3132

3233
struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu)
3334
{
35+
struct ceph_client *cl = ceph_inode_to_client(inode);
3436
int size;
3537
unsigned int retry_cnt = 0;
3638
const char *name;
@@ -72,8 +74,8 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu)
7274
} else if (size == -ENODATA || size == 0) {
7375
acl = NULL;
7476
} else {
75-
pr_err_ratelimited("get acl %llx.%llx failed, err=%d\n",
76-
ceph_vinop(inode), size);
77+
pr_err_ratelimited_client(cl, "%llx.%llx failed, err=%d\n",
78+
ceph_vinop(inode), size);
7779
acl = ERR_PTR(-EIO);
7880
}
7981

0 commit comments

Comments
 (0)