[PATCH 1/2] [multipath-tools] Fix failback parameter parsing in conf

[PATCH 1/2] [multipath-tools] Fix failback parameter parsing in conf

[Stewart, Sean]

This patch fixes a problem introduced in this commit: http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commitdiff;h=cef43b6f910f740c0e2d38761f58c5ebedfb7585;hp=41b85341ca514a50d18c592996a2ecb43a81fa90
Currently, the string handler for failback on hw entries expects strings like "manual" to be quoted.  The buffer always strips quotes.
As a result, the keywords manual, immediate, and followover cannot be used to change a failback parameter through multipath.conf

Signed-off-by: Sean Stewart <Sean.Stewart@netapp.com>

---
diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index a54dda9..5154cdd 100644
--- a/libmultipath/dict.c
+++ b/libmultipath/dict.c
@@ -1108,11 +1108,11 @@ hw_failback_handler(vector strvec)

        buff = set_value(strvec);

-       if (strlen(buff) == 6 && !strcmp(buff, "\"manual\""))
+       if (strlen(buff) == 6 && !strcmp(buff, "manual"))
                hwe->pgfailback = -FAILBACK_MANUAL;
-       else if (strlen(buff) == 9 && !strcmp(buff, "\"immediate\""))
+       else if (strlen(buff) == 9 && !strcmp(buff, "immediate"))
                hwe->pgfailback = -FAILBACK_IMMEDIATE;
-       else if (strlen(buff) == 10 && !strcmp(buff, "\"followover\""))
+       else if (strlen(buff) == 10 && !strcmp(buff, "followover"))
                hwe->pgfailback = -FAILBACK_FOLLOWOVER;
        else
                hwe->pgfailback = atoi(buff);
--

Re: [PATCH 1/2] [multipath-tools] Fix failback parameter parsing in conf

[Christophe Varoqui]

On mar., 2013-04-23 at 21:21 +0000, Stewart, Sean wrote:
> This patch fixes a problem introduced in this commit: http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commitdiff;h=cef43b6f910f740c0e2d38761f58c5ebedfb7585;hp=41b85341ca514a50d18c592996a2ecb43a81fa90
> Currently, the string handler for failback on hw entries expects strings like "manual" to be quoted.  The buffer always strips quotes.
> As a result, the keywords manual, immediate, and followover cannot be used to change a failback parameter through multipath.conf
> 
Hannes,

do you ack this one, which reverts part of
cef43b6f910f740c0e2d38761f58c5ebedfb7585 from your tree ?

Best regards,
Christophe Varoqui
www.opensvc.com


> Signed-off-by: Sean Stewart <Sean.Stewart@netapp.com>
> 
> ---
> diff --git a/libmultipath/dict.c b/libmultipath/dict.c
> index a54dda9..5154cdd 100644
> --- a/libmultipath/dict.c
> +++ b/libmultipath/dict.c
> @@ -1108,11 +1108,11 @@ hw_failback_handler(vector strvec)
> 
>         buff = set_value(strvec);
> 
> -       if (strlen(buff) == 6 && !strcmp(buff, "\"manual\""))
> +       if (strlen(buff) == 6 && !strcmp(buff, "manual"))
>                 hwe->pgfailback = -FAILBACK_MANUAL;
> -       else if (strlen(buff) == 9 && !strcmp(buff, "\"immediate\""))
> +       else if (strlen(buff) == 9 && !strcmp(buff, "immediate"))
>                 hwe->pgfailback = -FAILBACK_IMMEDIATE;
> -       else if (strlen(buff) == 10 && !strcmp(buff, "\"followover\""))
> +       else if (strlen(buff) == 10 && !strcmp(buff, "followover"))
>                 hwe->pgfailback = -FAILBACK_FOLLOWOVER;
>         else
>                 hwe->pgfailback = atoi(buff);
> --

Re: [PATCH 1/2] [multipath-tools] Fix failback parameter parsing in conf

[Hannes Reinecke]

On 04/27/2013 10:18 AM, Christophe Varoqui wrote:
> On mar., 2013-04-23 at 21:21 +0000, Stewart, Sean wrote:
>> This patch fixes a problem introduced in this commit: http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commitdiff;h=cef43b6f910f740c0e2d38761f58c5ebedfb7585;hp=41b85341ca514a50d18c592996a2ecb43a81fa90
>> Currently, the string handler for failback on hw entries expects strings like "manual" to be quoted.  The buffer always strips quotes.
>> As a result, the keywords manual, immediate, and followover cannot be used to change a failback parameter through multipath.conf
>>
> Hannes,
> 
> do you ack this one, which reverts part of
> cef43b6f910f740c0e2d38761f58c5ebedfb7585 from your tree ?
> 
Yes, sorry. Was an oversight on my part.

Acked-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

Re: [PATCH 1/2] [multipath-tools] Fix failback parameter parsing in conf

[Christophe Varoqui]

On mar., 2013-04-23 at 21:21 +0000, Stewart, Sean wrote:
> This patch fixes a problem introduced in this commit: http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commitdiff;h=cef43b6f910f740c0e2d38761f58c5ebedfb7585;hp=41b85341ca514a50d18c592996a2ecb43a81fa90
> Currently, the string handler for failback on hw entries expects strings like "manual" to be quoted.  The buffer always strips quotes.
> As a result, the keywords manual, immediate, and followover cannot be used to change a failback parameter through multipath.conf
> 
I applied this sequence,

though I had to use 'git am --ignore-whitespace' and fix the introduced
8-whitespace tabs in a follow-up patch. May be you should check your
development environment for the cause.

Thanks anyway,
Christophe Varoqui
www.opensvc.com


> Signed-off-by: Sean Stewart <Sean.Stewart@netapp.com>
> 
> ---
> diff --git a/libmultipath/dict.c b/libmultipath/dict.c
> index a54dda9..5154cdd 100644
> --- a/libmultipath/dict.c
> +++ b/libmultipath/dict.c
> @@ -1108,11 +1108,11 @@ hw_failback_handler(vector strvec)
> 
>         buff = set_value(strvec);
> 
> -       if (strlen(buff) == 6 && !strcmp(buff, "\"manual\""))
> +       if (strlen(buff) == 6 && !strcmp(buff, "manual"))
>                 hwe->pgfailback = -FAILBACK_MANUAL;
> -       else if (strlen(buff) == 9 && !strcmp(buff, "\"immediate\""))
> +       else if (strlen(buff) == 9 && !strcmp(buff, "immediate"))
>                 hwe->pgfailback = -FAILBACK_IMMEDIATE;
> -       else if (strlen(buff) == 10 && !strcmp(buff, "\"followover\""))
> +       else if (strlen(buff) == 10 && !strcmp(buff, "followover"))
>                 hwe->pgfailback = -FAILBACK_FOLLOWOVER;
>         else
>                 hwe->pgfailback = atoi(buff);
> --