Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <0b80e4f7-58ca-177d-be85-b825243aed0e@redhat.com>
Date:   Thu, 26 May 2022 13:34:24 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: [PATCH v2 2/2] rpcctl: Print a message if the user tries to
 modify a main xprt
Content-Language: en-US
To:     Anna Schumaker <anna@kernel.org>, linux-nfs@vger.kernel.org
References: <20220519154727.3577715-1-anna@kernel.org>
 <20220519154727.3577715-2-anna@kernel.org>
From:   Steve Dickson <steved@redhat.com>
In-Reply-To: <20220519154727.3577715-2-anna@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 5/19/22 11:47 AM, Anna Schumaker wrote:
> From: Anna Schumaker <Anna.Schumaker@Netapp.com>
> 
> '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 <Anna.Schumaker@Netapp.com>
Committed... (tag: nfs-utils-2-6-2-rc5)

steved
> ---
>   tools/rpcctl/rpcctl.py | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/rpcctl/rpcctl.py b/tools/rpcctl/rpcctl.py
> index 2a69eacd3103..d2110ad6de93 100755
> --- a/tools/rpcctl/rpcctl.py
> +++ b/tools/rpcctl/rpcctl.py
> @@ -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)