From: schumaker.anna@gmail.com
To: steved@redhat.com, linux-nfs@vger.kernel.org
Cc: Anna.Schumaker@Netapp.com
Subject: [PATCH v2 4/9] nfs-sysfs.py: Add a command for printing rpc-client information
Date: Fri, 6 Aug 2021 16:17:34 -0400 [thread overview]
Message-ID: <20210806201739.472806-5-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20210806201739.472806-1-Anna.Schumaker@Netapp.com>
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
It's mostly the same information as with xprt-switches, except with
rpc-client id prepended to the first line.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
tools/nfs-sysfs/client.py | 27 +++++++++++++++++++++++++++
tools/nfs-sysfs/nfs-sysfs.py | 2 ++
tools/nfs-sysfs/switch.py | 7 ++++---
3 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 tools/nfs-sysfs/client.py
diff --git a/tools/nfs-sysfs/client.py b/tools/nfs-sysfs/client.py
new file mode 100644
index 000000000000..5192cc226aed
--- /dev/null
+++ b/tools/nfs-sysfs/client.py
@@ -0,0 +1,27 @@
+import sysfs
+import switch
+
+class RpcClient:
+ def __init__(self, path):
+ self.path = path
+ self.id = int(str(path).rsplit("-", 1)[1])
+ self.switch = switch.XprtSwitch(path / (path / "switch").readlink(), sep=",")
+
+ def __lt__(self, rhs):
+ return self.id < rhs.id
+
+ def __str__(self):
+ return "client %s: %s" % (self.id, self.switch)
+
+
+def list_rpc_clients(args):
+ clients = [ RpcClient(f) for f in (sysfs.SUNRPC / "rpc-clients").iterdir() ]
+ clients.sort()
+ for client in clients:
+ if args.id == None or client.id == args.id[0]:
+ print(client)
+
+def add_command(subparser):
+ parser = subparser.add_parser("rpc-client", help="Commands for rpc clients")
+ parser.add_argument("--id", metavar="ID", nargs=1, type=int, help="Id of a specific client to show")
+ parser.set_defaults(func=list_rpc_clients)
diff --git a/tools/nfs-sysfs/nfs-sysfs.py b/tools/nfs-sysfs/nfs-sysfs.py
index dfad6ac08fa0..e2172cdfa4c1 100755
--- a/tools/nfs-sysfs/nfs-sysfs.py
+++ b/tools/nfs-sysfs/nfs-sysfs.py
@@ -10,9 +10,11 @@ def show_small_help(args):
parser.set_defaults(func=show_small_help)
+import client
import switch
import xprt
subparser = parser.add_subparsers(title="commands")
+client.add_command(subparser)
switch.add_command(subparser)
xprt.add_command(subparser)
diff --git a/tools/nfs-sysfs/switch.py b/tools/nfs-sysfs/switch.py
index afb6963a0a1f..5384f970235c 100644
--- a/tools/nfs-sysfs/switch.py
+++ b/tools/nfs-sysfs/switch.py
@@ -2,9 +2,10 @@ import sysfs
import xprt
class XprtSwitch:
- def __init__(self, path):
+ def __init__(self, path, sep=":"):
self.path = path
self.id = int(str(path).rsplit("-", 1)[1])
+ self.sep = sep
self.xprts = [ xprt.Xprt(p) for p in self.path.iterdir() if p.is_dir() ]
self.xprts.sort()
@@ -15,8 +16,8 @@ class XprtSwitch:
return self.path < rhs.path
def __str__(self):
- line = "switch %s: num_xprts %s, num_active %s, queue_len %s" % \
- (self.id, self.num_xprts, self.num_active, self.queue_len)
+ line = "switch %s%s num_xprts %s, num_active %s, queue_len %s" % \
+ (self.id, self.sep, self.num_xprts, self.num_active, self.queue_len)
for x in self.xprts:
line += "\n %s" % x.small_str()
return line
--
2.32.0
next prev parent reply other threads:[~2021-08-06 20:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 20:17 [PATCH v2 0/9] Add a tool for using the new sysfs files schumaker.anna
2021-08-06 20:17 ` [PATCH v2 1/9] nfs-sysfs: Add an nfs-sysfs.py tool schumaker.anna
2021-08-17 16:57 ` Mora, Jorge
2021-08-23 21:41 ` Anna Schumaker
2021-08-06 20:17 ` [PATCH v2 2/9] nfs-sysfs.py: Add a command for printing xprt switch information schumaker.anna
2021-08-06 20:17 ` [PATCH v2 3/9] nfs-sysfs.py: Add a command for printing individual xprts schumaker.anna
2021-08-06 20:17 ` schumaker.anna [this message]
2021-08-06 20:17 ` [PATCH v2 5/9] nfs-sysfs.py: Add a command for changing xprt dstaddr schumaker.anna
2021-08-06 20:17 ` [PATCH v2 6/9] nfs-sysfs.py: Add a command for changing xprt-switch dstaddrs schumaker.anna
2021-08-06 20:17 ` [PATCH v2 7/9] nfs-sysfs.py: Add a command for changing xprt state schumaker.anna
2021-08-17 17:00 ` Mora, Jorge
2021-08-06 20:17 ` [PATCH v2 8/9] nfs-sysfs: Add a man page schumaker.anna
2021-08-06 20:17 ` [PATCH v2 9/9] nfs-sysfs: Add installation to the Makefile schumaker.anna
2021-08-08 16:30 ` [PATCH v2 0/9] Add a tool for using the new sysfs files Steve Dickson
2021-08-08 19:00 ` Anna Schumaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210806201739.472806-5-Anna.Schumaker@Netapp.com \
--to=schumaker.anna@gmail.com \
--cc=Anna.Schumaker@Netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=steved@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.