rpcctl: Use the correct function for setting xprts offline and online
Subsystems (2)
Anna Schumaker
maintainerPATCH v2 1/2 rpcctl: Use the correct function for setting xprts offline and online
From: Anna Schumaker <[email protected]>
Otherwise the tool will tell us:
'Namespace' object has no attribute 'set_state'
--- tools/rpcctl/rpcctl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/rpcctl/rpcctl.py +1 -1
@@ -142,7 +142,7 @@ class Xprt: xprt.set_state("offline") xprt.set_state("remove") else: - args.set_state(args.property) + xprt.set_state(args.property) print(xprt)
Signature · 1 line
2.36.1
Anna Schumaker
maintainerPATCH v2 2/2 rpcctl: Print a message if the user tries to modify a main xprt
From: Anna Schumaker <[email protected]>
'main' xprts cannot be set offline or removed, so print a helpful error message in this case instead of a cryptic 'invalid argument' message.
--- tools/rpcctl/rpcctl.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/rpcctl/rpcctl.py +9 -2
@@ -90,10 +90,18 @@ class Xprt: self.dstaddr = write_addr_file(self.path / "dstaddr", newaddr) def set_state(self, state): + if self.info.get("main_xprt"): + raise Exception(f"Main xprts cannot be set {state}") with open(self.path / "xprt_state", 'w') as f: f.write(state) self.read_state() + def remove(self): + if self.info.get("main_xprt"): + raise Exception("Main xprts cannot be removed") + self.set_state("offline") + self.set_state("remove") + def add_command(subparser): parser = subparser.add_parser("xprt", help="Commands for individual xprts") parser.set_defaults(func=Xprt.show, xprt=None)
@@ -139,8 +147,7 @@ class Xprt: if args.property == "dstaddr": xprt.set_dstaddr(socket.gethostbyname(args.newaddr[0])) elif args.property == "remove": - xprt.set_state("offline") - xprt.set_state("remove") + xprt.remove() else: xprt.set_state(args.property) print(xprt)
Signature · 1 line
2.36.1
Re: [PATCH v2 2/2] rpcctl: Print a message if the user tries to modify a main xprt
Quoted 6 lines · Anna Schumaker
From: Anna Schumaker <[email protected]>
'main' xprts cannot be set offline or removed, so print a helpful error message in this case instead of a cryptic 'invalid argument' message.
Signed-off-by Anna Schumaker <[email protected]>
Committed... (tag: nfs-utils-2-6-2-rc5)
steved
Quoted 37 lines
--- tools/rpcctl/rpcctl.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)tools/rpcctl/rpcctl.py +9
-2@@ -90,10 +90,18 @@ class Xprt: self.dstaddr = write_addr_file(self.path / "dstaddr", newaddr) def set_state(self, state): + if self.info.get("main_xprt"): + raise Exception(f"Main xprts cannot be set {state}") with open(self.path / "xprt_state", 'w') as f: f.write(state) self.read_state() + def remove(self): + if self.info.get("main_xprt"): + raise Exception("Main xprts cannot be removed") + self.set_state("offline") + self.set_state("remove") + def add_command(subparser): parser = subparser.add_parser("xprt", help="Commands for individual xprts") parser.set_defaults(func=Xprt.show, xprt=None)@@ -139,8 +147,7 @@ class Xprt: if args.property == "dstaddr": xprt.set_dstaddr(socket.gethostbyname(args.newaddr[0])) elif args.property == "remove": - xprt.set_state("offline") - xprt.set_state("remove") + xprt.remove() else: xprt.set_state(args.property) print(xprt)
Quoted 6 lines · Anna Schumaker
From: Anna Schumaker <[email protected]>
Otherwise the tool will tell us:
'Namespace' object has no attribute 'set_state'Signed-off-by Anna Schumaker <[email protected]>
Committed... (tag: nfs-utils-2-6-2-rc5)
steved.
Quoted 17 lines
--- tools/rpcctl/rpcctl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/rpcctl/rpcctl.py +1
-1@@ -142,7 +142,7 @@ class Xprt: xprt.set_state("offline") xprt.set_state("remove") else: - args.set_state(args.property) + xprt.set_state(args.property) print(xprt)