From: schumaker.anna@gmail.com
To: steved@redhat.com, linux-nfs@vger.kernel.org
Cc: Anna.Schumaker@Netapp.com
Subject: [PATCH v6 2/9] rpcctl: Add a command for printing xprt switch information
Date: Tue, 25 Jan 2022 14:09:39 -0500 [thread overview]
Message-ID: <20220125190946.23586-3-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20220125190946.23586-1-Anna.Schumaker@Netapp.com>
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
This combines the information found in xprt_switch_info with a subset of
the information found in each xprt subdirectory
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
--
v6: Continue squashing into a single file
Change XprtSwitch comparison to use id instead of path
---
tools/rpcctl/rpcctl.py | 68 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/tools/rpcctl/rpcctl.py b/tools/rpcctl/rpcctl.py
index 9851d2f5f9a6..a6bd418f8d4a 100755
--- a/tools/rpcctl/rpcctl.py
+++ b/tools/rpcctl/rpcctl.py
@@ -1,5 +1,6 @@
#!/usr/bin/python3
import argparse
+import collections
import pathlib
import sys
@@ -14,6 +15,70 @@ if not sunrpc.is_dir():
print("ERROR: sysfs does not have sunrpc directory")
sys.exit(1)
+def read_addr_file(path):
+ try:
+ with open(path, 'r') as f:
+ return f.readline().strip()
+ except:
+ return "(enoent)"
+
+def read_info_file(path):
+ res = collections.defaultdict(int)
+ try:
+ with open(path) as info:
+ lines = [ l.split("=", 1) for l in info if "=" in l ]
+ res.update({ key:int(val.strip()) for (key, val) in lines })
+ finally:
+ return res
+
+
+class Xprt:
+ def __init__(self, path):
+ self.path = path
+ self.id = int(path.stem.split("-")[1])
+ self.type = path.stem.split("-")[2]
+ self.dstaddr = read_addr_file(path / "dstaddr")
+
+ def __lt__(self, rhs):
+ return self.id < rhs.id
+
+ def small_str(self):
+ return f"xprt {self.id}: {self.type}, {self.dstaddr}"
+
+
+class XprtSwitch:
+ def __init__(self, path):
+ self.path = path
+ self.id = int(path.stem.split("-")[1])
+ self.info = read_info_file(path / "xprt_switch_info")
+
+ self.xprts = [ Xprt(p) for p in self.path.iterdir() if p.is_dir() ]
+ self.xprts.sort()
+
+ def __lt__(self, rhs):
+ return self.id < rhs.id
+
+ def __str__(self):
+ switch = f"switch {self.id}: " \
+ f"xprts {self.info['num_xprts']}, " \
+ f"active {self.info['num_active']}, " \
+ f"queue {self.info['queue_len']}"
+ xprts = [ f" {x.small_str()}" for x in self.xprts ]
+ return "\n".join([ switch ] + xprts)
+
+ def add_command(subparser):
+ parser = subparser.add_parser("switch", help="Commands for xprt switches")
+ parser.add_argument("--id", metavar="ID", nargs=1, type=int, help="Id of a specific xprt-switch to show")
+ parser.set_defaults(func=XprtSwitch.list_all)
+
+ def list_all(args):
+ switches = [ XprtSwitch(f) for f in (sunrpc / "xprt-switches").iterdir() ]
+ switches.sort()
+ for xs in switches:
+ if args.id == None or xs.id == args.id[0]:
+ print(xs)
+
+
parser = argparse.ArgumentParser()
def show_small_help(args):
@@ -21,5 +86,8 @@ def show_small_help(args):
print("sunrpc dir:", sunrpc)
parser.set_defaults(func=show_small_help)
+subparser = parser.add_subparsers(title="commands")
+XprtSwitch.add_command(subparser)
+
args = parser.parse_args()
args.func(args)
--
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 ` schumaker.anna [this message]
2022-01-25 19:09 ` [PATCH v6 3/9] rpcctl: Add a command for printing individual xprts schumaker.anna
2022-01-25 19:09 ` [PATCH v6 4/9] rpcctl: Add a command for printing rpc client information schumaker.anna
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-3-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.