2020-08-24 03:03:37

by Yanhu Cao

Subject: [PATCH] ceph: add column 'mds' to show caps in more user friendly

In multi-mds, the 'caps' debugfs file will have duplicate ino,
add the 'mds' column to indicate which mds session the cap belongs to.

Signed-off-by: Yanhu Cao <[email protected]>
---
fs/ceph/debugfs.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index 97539b497e4c..47f8971a9c52 100644
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -202,7 +202,8 @@ static int caps_show_cb(struct inode *inode, struct ceph_cap *cap, void *p)
{
struct seq_file *s = p;

- seq_printf(s, "0x%-17lx%-17s%-17s\n", inode->i_ino,
+ seq_printf(s, "0x%-17lx%-3d%-17s%-17s\n", inode->i_ino,
+ cap->session->s_mds,
ceph_cap_string(cap->issued),
ceph_cap_string(cap->implemented));
return 0;
@@ -222,8 +223,8 @@ static int caps_show(struct seq_file *s, void *p)
"reserved\t%d\n"
"min\t\t%d\n\n",
total, avail, used, reserved, min);
- seq_printf(s, "ino issued implemented\n");
- seq_printf(s, "-----------------------------------------------\n");
+ seq_printf(s, "ino mds issued implemented\n");
+ seq_printf(s, "--------------------------------------------------\n");

mutex_lock(&mdsc->mutex);
for (i = 0; i < mdsc->max_sessions; i++) {
--
2.24.3 (Apple Git-128)

2020-08-24 15:17:06

by Jeffrey Layton

Subject: Re: [PATCH] ceph: add column 'mds' to show caps in more user friendly

On Mon, 2020-08-24 at 11:00 +0800, Yanhu Cao wrote:
> In multi-mds, the 'caps' debugfs file will have duplicate ino,
> add the 'mds' column to indicate which mds session the cap belongs to.
>
> Signed-off-by: Yanhu Cao <[email protected]>
> ---
> fs/ceph/debugfs.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
> index 97539b497e4c..47f8971a9c52 100644
> --- a/fs/ceph/debugfs.c
> +++ b/fs/ceph/debugfs.c
> @@ -202,7 +202,8 @@ static int caps_show_cb(struct inode *inode, struct ceph_cap *cap, void *p)
> {
> struct seq_file *s = p;
>
> - seq_printf(s, "0x%-17lx%-17s%-17s\n", inode->i_ino,
> + seq_printf(s, "0x%-17lx%-3d%-17s%-17s\n", inode->i_ino,
> + cap->session->s_mds,
> ceph_cap_string(cap->issued),
> ceph_cap_string(cap->implemented));
> return 0;
> @@ -222,8 +223,8 @@ static int caps_show(struct seq_file *s, void *p)
> "reserved\t%d\n"
> "min\t\t%d\n\n",
> total, avail, used, reserved, min);
> - seq_printf(s, "ino issued implemented\n");
> - seq_printf(s, "-----------------------------------------------\n");
> + seq_printf(s, "ino mds issued implemented\n");
> + seq_printf(s, "--------------------------------------------------\n");
>
> mutex_lock(&mdsc->mutex);
> for (i = 0; i < mdsc->max_sessions; i++) {

Looks good. Merged.

Thanks!
--
Jeff Layton <[email protected]>