[dm-devel] [PATCH v3 05/10] libmultipath: detect_alua(): use system timeout

[Benjamin Marzinski]

On Mon, Mar 18, 2019 at 12:24:40PM +0100, Martin Wilck wrote:
> This is not the path checker - we don't need to use the
> configured checker timeout here. This makes it possible to
> call this function without a current (struct config *).

I feel like checker_timeout is badly named, since we use if for a lot of
timeouts that aren't in the checker.  In general, I feel like we should
allow users to configure how long they want these sorts of calls to wait
for a response. I get why you changed this, but it may be worth thinking
about if we should deal with this timeout like we deal with verbosity,
where, we track it outside of the config structure.

But that doesn't need to be dealt with now, so

Reviewed-by: Benjamin Marzinski <bmarzins at redhat.com> 
 
> Signed-off-by: Martin Wilck <mwilck at suse.com>
> ---
>  libmultipath/discovery.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
> index 270dedc9..b2a43e86 100644
> --- a/libmultipath/discovery.c
> +++ b/libmultipath/discovery.c
> @@ -833,11 +833,14 @@ get_serial (char * str, int maxlen, int fd)
>  }
>  
>  static void
> -detect_alua(struct path * pp, struct config *conf)
> +detect_alua(struct path * pp)
>  {
>  	int ret;
>  	int tpgs;
> -	unsigned int timeout = conf->checker_timeout;
> +	unsigned int timeout;
> +
> +	if (sysfs_get_timeout(pp, &timeout) <= 0)
> +		timeout = DEF_TIMEOUT;
>  
>  	if ((tpgs = get_target_port_group_support(pp, timeout)) <= 0) {
>  		pp->tpgs = TPGS_NONE;
> @@ -1519,7 +1522,7 @@ scsi_ioctl_pathinfo (struct path * pp, struct config *conf, int mask)
>  	const char *attr_path = NULL;
>  
>  	if (pp->tpgs == TPGS_UNDEF)
> -		detect_alua(pp, conf);
> +		detect_alua(pp);
>  
>  	if (!(mask & DI_SERIAL))
>  		return;
> -- 
> 2.21.0