From: schumaker.anna@gmail.com
To: steved@redhat.com, linux-nfs@vger.kernel.org
Cc: Anna.Schumaker@Netapp.com
Subject: [PATCH v5 7/9] rpcctl: Add a command for changing xprt state
Date: Thu, 28 Oct 2021 14:35:17 -0400 [thread overview]
Message-ID: <20211028183519.160772-8-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20211028183519.160772-1-Anna.Schumaker@Netapp.com>
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
We can set it offline or online, or we can remove an xprt. The kernel
only supports removing offlined transports, so we make sure to set the
state to "offline" before sending the remove command.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
tools/rpcctl/xprt.py | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/tools/rpcctl/xprt.py b/tools/rpcctl/xprt.py
index 1201140ce5af..92db756c8374 100644
--- a/tools/rpcctl/xprt.py
+++ b/tools/rpcctl/xprt.py
@@ -9,9 +9,7 @@ class Xprt:
self.info = sysfs.read_info_file(path / "xprt_info")
self.dstaddr = sysfs.read_addr_file(path / "dstaddr")
self.srcaddr = sysfs.read_addr_file(path / "srcaddr")
-
- with open(path / "xprt_state") as f:
- self.state = ','.join(f.readline().split()[1:])
+ self.read_state()
def __lt__(self, rhs):
return self.id < rhs.id
@@ -35,9 +33,16 @@ class Xprt:
f"backlog {self.info['backlog_q_len']}, tasks {self.info['tasks_queuelen']}"
def __str__(self):
+ if not self.path.exists():
+ return f"xprt {self.id}: has been removed" % self.id
return "\n".join([self._xprt(), self._src_reqs(),
self._cong_slots(), self._queues() ])
+ def read_state(self):
+ if self.path.exists():
+ with open(self.path / "xprt_state") as f:
+ self.state = ','.join(f.readline().split()[1:])
+
def small_str(self):
main = " [main]" if self.info.get("main_xprt") else ""
return f"xprt {self.id}: {self.type}, {self.dstaddr}{main}"
@@ -46,6 +51,11 @@ class Xprt:
resolved = socket.gethostbyname(newaddr)
self.dstaddr = sysfs.write_addr_file(self.path / "dstaddr", resolved)
+ def set_state(self, state):
+ with open(self.path / "xprt_state", 'w') as f:
+ f.write(state)
+ self.read_state()
+
def list_xprts(args):
xprts = [ Xprt(f) for f in (sysfs.SUNRPC / "xprt-switches").glob("**/xprt-*") ]
@@ -65,6 +75,13 @@ def set_xprt_property(args):
try:
if args.dstaddr != None:
xprt.set_dstaddr(args.dstaddr[0])
+ if args.offline:
+ xprt.set_state("offline")
+ elif args.online:
+ xprt.set_state("online")
+ elif args.remove:
+ xprt.set_state("offline")
+ xprt.set_state("remove")
print(xprt)
except Exception as e:
print(e)
@@ -78,4 +95,7 @@ def add_command(subparser):
parser = subparser.add_parser("set", help="Set an xprt property")
parser.add_argument("--id", metavar="ID", nargs=1, type=int, required=True, help="Id of a specific xprt to modify")
parser.add_argument("--dstaddr", metavar="dstaddr", nargs=1, type=str, help="New dstaddr to set")
+ parser.add_argument("--offline", action="store_true", help="Set an xprt offline")
+ parser.add_argument("--online", action="store_true", help="Set an offline xprt back online")
+ parser.add_argument("--remove", action="store_true", help="Remove an xprt")
parser.set_defaults(func=set_xprt_property)
--
2.33.1
next prev parent reply other threads:[~2021-10-28 18:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 18:35 [PATCH v5 0/9] Add a tool for using the new sysfs files schumaker.anna
2021-10-28 18:35 ` [PATCH v5 1/9] rpcctl: Add a rpcctl.py tool schumaker.anna
2021-10-28 18:35 ` [PATCH v5 2/9] rpcctl: Add a command for printing xprt switch information schumaker.anna
2021-10-28 18:35 ` [PATCH v5 3/9] rpcctl: Add a command for printing individual xprts schumaker.anna
2021-10-28 18:35 ` [PATCH v5 4/9] rpcctl: Add a command for printing rpc client information schumaker.anna
2021-10-28 18:35 ` [PATCH v5 5/9] rpcctl: Add a command for changing xprt dstaddr schumaker.anna
2021-10-28 18:35 ` [PATCH v5 6/9] rpcctl: Add a command for changing xprt switch dstaddrs schumaker.anna
2021-10-28 18:35 ` schumaker.anna [this message]
2021-10-28 18:35 ` [PATCH v5 8/9] rpcctl: Add a man page schumaker.anna
2021-10-28 18:35 ` [PATCH v5 9/9] rpcctl: Add installation to the Makefile schumaker.anna
2021-11-08 17:15 ` Steve Dickson
2021-11-08 17:19 ` Steve Dickson
2021-11-08 18:15 ` Anna Schumaker
2021-11-01 14:40 ` [PATCH v5 0/9] Add a tool for using the new sysfs files Chuck Lever III
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=20211028183519.160772-8-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox