Commit 38d46409 authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

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: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarPatrick Donnelly <pdonnell@redhat.com>
Reviewed-by: default avatarMilind Changire <mchangir@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 5995d90d

fs/ceph/acl.c

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/slab.h>



#include "super.h"

#include "mds_client.h"



static inline void ceph_set_cached_acl(struct inode *inode,

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


struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu)

{

	struct ceph_client *cl = ceph_inode_to_client(inode);

	int size;

	unsigned int retry_cnt = 0;

	const char *name;
@@ -72,7 +74,7 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu) 
	} else if (size == -ENODATA || size == 0) {

		acl = NULL;

	} else {

		pr_err_ratelimited("get acl %llx.%llx failed, err=%d\n",

		pr_err_ratelimited_client(cl, "%llx.%llx failed, err=%d\n",

					  ceph_vinop(inode), size);

		acl = ERR_PTR(-EIO);

	}

fs/ceph/addr.c

+153 −126

File changed.

Preview size limit exceeded, changes collapsed.

fs/ceph/caps.c

+410 −300

File changed.

Preview size limit exceeded, changes collapsed.

fs/ceph/crypto.c

+26 −13
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req, 
static struct inode *parse_longname(const struct inode *parent,

				    const char *name, int *name_len)

{

	struct ceph_client *cl = ceph_inode_to_client(parent);

	struct inode *dir = NULL;

	struct ceph_vino vino = { .snap = CEPH_NOSNAP };

	char *inode_number;
@@ -222,12 +223,12 @@ static struct inode *parse_longname(const struct inode *parent, 
	name++;

	name_end = strrchr(name, '_');

	if (!name_end) {

		dout("Failed to parse long snapshot name: %s\n", name);

		doutc(cl, "failed to parse long snapshot name: %s\n", name);

		return ERR_PTR(-EIO);

	}

	*name_len = (name_end - name);

	if (*name_len <= 0) {

		pr_err("Failed to parse long snapshot name\n");

		pr_err_client(cl, "failed to parse long snapshot name\n");

		return ERR_PTR(-EIO);

	}
@@ -239,7 +240,7 @@ static struct inode *parse_longname(const struct inode *parent, 
		return ERR_PTR(-ENOMEM);

	ret = kstrtou64(inode_number, 10, &vino.ino);

	if (ret) {

		dout("Failed to parse inode number: %s\n", name);

		doutc(cl, "failed to parse inode number: %s\n", name);

		dir = ERR_PTR(ret);

		goto out;

	}
@@ -250,7 +251,7 @@ static struct inode *parse_longname(const struct inode *parent, 
		/* This can happen if we're not mounting cephfs on the root */

		dir = ceph_get_inode(parent->i_sb, vino, NULL);

		if (IS_ERR(dir))

			dout("Can't find inode %s (%s)\n", inode_number, name);

			doutc(cl, "can't find inode %s (%s)\n", inode_number, name);

	}



out:
@@ -261,6 +262,7 @@ static struct inode *parse_longname(const struct inode *parent, 
int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,

				char *buf)

{

	struct ceph_client *cl = ceph_inode_to_client(parent);

	struct inode *dir = parent;

	struct qstr iname;

	u32 len;
@@ -329,7 +331,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name, 


	/* base64 encode the encrypted name */

	elen = ceph_base64_encode(cryptbuf, len, buf);

	dout("base64-encoded ciphertext name = %.*s\n", elen, buf);

	doutc(cl, "base64-encoded ciphertext name = %.*s\n", elen, buf);



	/* To understand the 240 limit, see CEPH_NOHASH_NAME_MAX comments */

	WARN_ON(elen > 240);
@@ -504,7 +506,10 @@ int ceph_fscrypt_decrypt_block_inplace(const struct inode *inode, 
				  struct page *page, unsigned int len,

				  unsigned int offs, u64 lblk_num)

{

	dout("%s: len %u offs %u blk %llu\n", __func__, len, offs, lblk_num);

	struct ceph_client *cl = ceph_inode_to_client(inode);



	doutc(cl, "%p %llx.%llx len %u offs %u blk %llu\n", inode,

	      ceph_vinop(inode), len, offs, lblk_num);

	return fscrypt_decrypt_block_inplace(inode, page, len, offs, lblk_num);

}
@@ -513,7 +518,10 @@ int ceph_fscrypt_encrypt_block_inplace(const struct inode *inode, 
				  unsigned int offs, u64 lblk_num,

				  gfp_t gfp_flags)

{

	dout("%s: len %u offs %u blk %llu\n", __func__, len, offs, lblk_num);

	struct ceph_client *cl = ceph_inode_to_client(inode);



	doutc(cl, "%p %llx.%llx len %u offs %u blk %llu\n", inode,

	      ceph_vinop(inode), len, offs, lblk_num);

	return fscrypt_encrypt_block_inplace(inode, page, len, offs, lblk_num,

					     gfp_flags);

}
@@ -582,6 +590,7 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 
				 u64 off, struct ceph_sparse_extent *map,

				 u32 ext_cnt)

{

	struct ceph_client *cl = ceph_inode_to_client(inode);

	int i, ret = 0;

	struct ceph_inode_info *ci = ceph_inode(inode);

	u64 objno, objoff;
@@ -589,7 +598,8 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 


	/* Nothing to do for empty array */

	if (ext_cnt == 0) {

		dout("%s: empty array, ret 0\n", __func__);

		doutc(cl, "%p %llx.%llx empty array, ret 0\n", inode,

		      ceph_vinop(inode));

		return 0;

	}
@@ -603,14 +613,17 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 
		int fret;



		if ((ext->off | ext->len) & ~CEPH_FSCRYPT_BLOCK_MASK) {

			pr_warn("%s: bad encrypted sparse extent idx %d off %llx len %llx\n",

				__func__, i, ext->off, ext->len);

			pr_warn_client(cl,

				"%p %llx.%llx bad encrypted sparse extent "

				"idx %d off %llx len %llx\n",

				inode, ceph_vinop(inode), i, ext->off,

				ext->len);

			return -EIO;

		}

		fret = ceph_fscrypt_decrypt_pages(inode, &page[pgidx],

						 off + pgsoff, ext->len);

		dout("%s: [%d] 0x%llx~0x%llx fret %d\n", __func__, i,

				ext->off, ext->len, fret);

		doutc(cl, "%p %llx.%llx [%d] 0x%llx~0x%llx fret %d\n", inode,

		      ceph_vinop(inode), i, ext->off, ext->len, fret);

		if (fret < 0) {

			if (ret == 0)

				ret = fret;
@@ -618,7 +631,7 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 
		}

		ret = pgsoff + fret;

	}

	dout("%s: ret %d\n", __func__, ret);

	doutc(cl, "ret %d\n", ret);

	return ret;

}

fs/ceph/debugfs.c

+4 −2
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ DEFINE_SIMPLE_ATTRIBUTE(congestion_kb_fops, congestion_kb_get, 


void ceph_fs_debugfs_cleanup(struct ceph_fs_client *fsc)

{

	dout("ceph_fs_debugfs_cleanup\n");

	doutc(fsc->client, "begin\n");

	debugfs_remove(fsc->debugfs_bdi);

	debugfs_remove(fsc->debugfs_congestion_kb);

	debugfs_remove(fsc->debugfs_mdsmap);
@@ -407,13 +407,14 @@ void ceph_fs_debugfs_cleanup(struct ceph_fs_client *fsc) 
	debugfs_remove(fsc->debugfs_status);

	debugfs_remove(fsc->debugfs_mdsc);

	debugfs_remove_recursive(fsc->debugfs_metrics_dir);

	doutc(fsc->client, "done\n");

}



void ceph_fs_debugfs_init(struct ceph_fs_client *fsc)

{

	char name[100];



	dout("ceph_fs_debugfs_init\n");

	doutc(fsc->client, "begin\n");

	fsc->debugfs_congestion_kb =

		debugfs_create_file("writeback_congestion_kb",

				    0600,
@@ -469,6 +470,7 @@ void ceph_fs_debugfs_init(struct ceph_fs_client *fsc) 
			    &metrics_size_fops);

	debugfs_create_file("caps", 0400, fsc->debugfs_metrics_dir, fsc,

			    &metrics_caps_fops);

	doutc(fsc->client, "done\n");

}