From: schumaker.anna@gmail.com
To: steved@redhat.com, linux-nfs@vger.kernel.org
Cc: Anna.Schumaker@Netapp.com
Subject: [PATCH v6 4/9] rpcctl: Add a command for printing rpc client information
Date: Tue, 25 Jan 2022 14:09:41 -0500 [thread overview]
Message-ID: <20220125190946.23586-5-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20220125190946.23586-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>
---
v6: Squash into a single file
---
tools/rpcctl/rpcctl.py | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/tools/rpcctl/rpcctl.py b/tools/rpcctl/rpcctl.py
index ae338e06f802..169a2a3c0ef9 100755
--- a/tools/rpcctl/rpcctl.py
+++ b/tools/rpcctl/rpcctl.py
@@ -87,10 +87,11 @@ class Xprt:
class XprtSwitch:
- def __init__(self, path):
+ def __init__(self, path, sep=":"):
self.path = path
self.id = int(path.stem.split("-")[1])
self.info = read_info_file(path / "xprt_switch_info")
+ self.sep = sep
self.xprts = [ Xprt(p) for p in self.path.iterdir() if p.is_dir() ]
self.xprts.sort()
@@ -99,7 +100,7 @@ class XprtSwitch:
return self.id < rhs.id
def __str__(self):
- switch = f"switch {self.id}: " \
+ switch = f"switch {self.id}{self.sep} " \
f"xprts {self.info['num_xprts']}, " \
f"active {self.info['num_active']}, " \
f"queue {self.info['queue_len']}"
@@ -119,6 +120,32 @@ class XprtSwitch:
print(xs)
+class RpcClient:
+ def __init__(self, path):
+ self.path = path
+ self.id = int(path.stem.split("-")[1])
+ self.switch = XprtSwitch(path / (path / "switch").readlink(), sep=",")
+
+ def __lt__(self, rhs):
+ return self.id < rhs.id
+
+ def __str__(self):
+ return f"client {self.id}: {self.switch}"
+
+ def add_command(subparser):
+ parser = subparser.add_parser("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=RpcClient.list_all)
+
+ def list_all(args):
+ clients = [ RpcClient(f) for f in (sunrpc / "rpc-clients").iterdir() ]
+ clients.sort()
+ for client in clients:
+ if args.id == None or client.id == args.id[0]:
+ print(client)
+
+
+
parser = argparse.ArgumentParser()
def show_small_help(args):
@@ -127,6 +154,7 @@ def show_small_help(args):
parser.set_defaults(func=show_small_help)
subparser = parser.add_subparsers(title="commands")
+RpcClient.add_command(subparser)
XprtSwitch.add_command(subparser)
Xprt.add_command(subparser)
--
2.34.1
next prev parent reply other threads:[~2022-01-25 19:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 19:09 [PATCH v6 0/9] Add a tool for using the new sysfs files schumaker.anna
2022-01-25 19:09 ` [PATCH v6 1/9] rpcctl: Add a rpcctl.py tool schumaker.anna
2022-01-25 19:09 ` [PATCH v6 2/9] rpcctl: Add a command for printing xprt switch information schumaker.anna
2022-01-25 19:09 ` [PATCH v6 3/9] rpcctl: Add a command for printing individual xprts schumaker.anna
2022-01-25 19:09 ` schumaker.anna [this message]
2022-01-25 19:09 ` [PATCH v6 5/9] rpcctl: Add a command for changing xprt dstaddr schumaker.anna
2022-01-25 19:09 ` [PATCH v6 6/9] rpcctl: Add a command for changing xprt switch dstaddrs schumaker.anna
2022-01-25 19:09 ` [PATCH v6 7/9] rpcctl: Add a command for changing xprt state schumaker.anna
2022-01-25 19:09 ` [PATCH v6 8/9] rpcctl: Add a man page schumaker.anna
2022-01-25 19:09 ` [PATCH v6 9/9] rpcctl: Add installation to the Makefile schumaker.anna
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=20220125190946.23586-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.