* [PATCH] multipath-tools: Replace multipath configuration output
@ 2017-04-18 0:07 Xose Vazquez Perez
2017-05-18 0:06 ` Xose Vazquez Perez
0 siblings, 1 reply; 16+ messages in thread
From: Xose Vazquez Perez @ 2017-04-18 0:07 UTC (permalink / raw)
Cc: device-mapper development, Xose Vazquez Perez
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
libmultipath/propsel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
index 09fe728..782f039 100644
--- a/libmultipath/propsel.c
+++ b/libmultipath/propsel.c
@@ -286,11 +286,11 @@ out:
if (mp->no_path_retry == NO_PATH_RETRY_UNDEF)
mp->no_path_retry = NO_PATH_RETRY_QUEUE;
else if (mp->no_path_retry == NO_PATH_RETRY_FAIL) {
- condlog(1, "%s: config error, overriding 'no_path_retry' value",
+ condlog(1, "%s: config ERROR (setting: overriding 'no_path_retry' value)",
mp->alias);
mp->no_path_retry = NO_PATH_RETRY_QUEUE;
} else if (mp->no_path_retry != NO_PATH_RETRY_QUEUE)
- condlog(1, "%s: config error, ignoring 'queue_if_no_path' because no_path_retry=%d",
+ condlog(1, "%s: config ERROR (setting: ignoring 'queue_if_no_path' because no_path_retry = %d)",
mp->alias, mp->no_path_retry);
}
return 0;
@@ -470,7 +470,7 @@ out:
condlog(3, "%s: no_path_retry = %s %s", mp->alias, buff,
origin);
else if (mp->no_path_retry != NO_PATH_RETRY_UNDEF)
- condlog(3, "%s: no_path_retry = %s (inherited setting)",
+ condlog(3, "%s: no_path_retry = %s (setting: inherited value)",
mp->alias, buff);
else
condlog(3, "%s: no_path_retry = undef (setting: multipath internal)",
--
2.12.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: Replace multipath configuration output
2017-04-18 0:07 [PATCH] multipath-tools: Replace multipath configuration output Xose Vazquez Perez
@ 2017-05-18 0:06 ` Xose Vazquez Perez
2017-06-21 10:33 ` Christophe Varoqui
0 siblings, 1 reply; 16+ messages in thread
From: Xose Vazquez Perez @ 2017-05-18 0:06 UTC (permalink / raw)
Cc: device-mapper development
On 04/18/2017 02:07 AM, Xose Vazquez Perez wrote:
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: device-mapper development <dm-devel@redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
This is missing.
> ---
> libmultipath/propsel.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> index 09fe728..782f039 100644
> --- a/libmultipath/propsel.c
> +++ b/libmultipath/propsel.c
> @@ -286,11 +286,11 @@ out:
> if (mp->no_path_retry == NO_PATH_RETRY_UNDEF)
> mp->no_path_retry = NO_PATH_RETRY_QUEUE;
> else if (mp->no_path_retry == NO_PATH_RETRY_FAIL) {
> - condlog(1, "%s: config error, overriding 'no_path_retry' value",
> + condlog(1, "%s: config ERROR (setting: overriding 'no_path_retry' value)",
> mp->alias);
> mp->no_path_retry = NO_PATH_RETRY_QUEUE;
> } else if (mp->no_path_retry != NO_PATH_RETRY_QUEUE)
> - condlog(1, "%s: config error, ignoring 'queue_if_no_path' because no_path_retry=%d",
> + condlog(1, "%s: config ERROR (setting: ignoring 'queue_if_no_path' because no_path_retry = %d)",
> mp->alias, mp->no_path_retry);
> }
> return 0;
> @@ -470,7 +470,7 @@ out:
> condlog(3, "%s: no_path_retry = %s %s", mp->alias, buff,
> origin);
> else if (mp->no_path_retry != NO_PATH_RETRY_UNDEF)
> - condlog(3, "%s: no_path_retry = %s (inherited setting)",
> + condlog(3, "%s: no_path_retry = %s (setting: inherited value)",
> mp->alias, buff);
> else
> condlog(3, "%s: no_path_retry = undef (setting: multipath internal)",
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: Replace multipath configuration output
2017-05-18 0:06 ` Xose Vazquez Perez
@ 2017-06-21 10:33 ` Christophe Varoqui
0 siblings, 0 replies; 16+ messages in thread
From: Christophe Varoqui @ 2017-06-21 10:33 UTC (permalink / raw)
To: Xose Vazquez Perez; +Cc: device-mapper development
[-- Attachment #1.1: Type: text/plain, Size: 2090 bytes --]
Merged,
Thanks.
On Thu, May 18, 2017 at 2:06 AM, Xose Vazquez Perez <xose.vazquez@gmail.com>
wrote:
> On 04/18/2017 02:07 AM, Xose Vazquez Perez wrote:
>
> > Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> > Cc: device-mapper development <dm-devel@redhat.com>
> > Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
>
> This is missing.
>
> > ---
> > libmultipath/propsel.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> > index 09fe728..782f039 100644
> > --- a/libmultipath/propsel.c
> > +++ b/libmultipath/propsel.c
> > @@ -286,11 +286,11 @@ out:
> > if (mp->no_path_retry == NO_PATH_RETRY_UNDEF)
> > mp->no_path_retry = NO_PATH_RETRY_QUEUE;
> > else if (mp->no_path_retry == NO_PATH_RETRY_FAIL) {
> > - condlog(1, "%s: config error, overriding
> 'no_path_retry' value",
> > + condlog(1, "%s: config ERROR (setting: overriding
> 'no_path_retry' value)",
> > mp->alias);
> > mp->no_path_retry = NO_PATH_RETRY_QUEUE;
> > } else if (mp->no_path_retry != NO_PATH_RETRY_QUEUE)
> > - condlog(1, "%s: config error, ignoring
> 'queue_if_no_path' because no_path_retry=%d",
> > + condlog(1, "%s: config ERROR (setting: ignoring
> 'queue_if_no_path' because no_path_retry = %d)",
> > mp->alias, mp->no_path_retry);
> > }
> > return 0;
> > @@ -470,7 +470,7 @@ out:
> > condlog(3, "%s: no_path_retry = %s %s", mp->alias, buff,
> > origin);
> > else if (mp->no_path_retry != NO_PATH_RETRY_UNDEF)
> > - condlog(3, "%s: no_path_retry = %s (inherited setting)",
> > + condlog(3, "%s: no_path_retry = %s (setting: inherited
> value)",
> > mp->alias, buff);
> > else
> > condlog(3, "%s: no_path_retry = undef (setting: multipath
> internal)",
> >
>
>
[-- Attachment #1.2: Type: text/html, Size: 3186 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
[not found] ` <c78854cd-f7f2-77ef-2d19-a5ff236e9a37@gmail.com>
@ 2017-08-20 0:47 ` Xose Vazquez Perez
0 siblings, 0 replies; 16+ messages in thread
From: Xose Vazquez Perez @ 2017-08-20 0:47 UTC (permalink / raw)
To: Martin Wilck, dm-devel, Christophe Varoqui
On 12/08/2016 12:12 AM, Xose Vazquez Perez wrote:
> On 12/07/2016 05:17 PM, Martin Wilck wrote:
>
>>> "controller", what controller? local hba? array controller?
>>> "array" is unequivocal.
>>>
>> I tend to associate "array" with "RAID", and therefore I found this
>> term confusing. Perhaps "storage" or "storage array"? Or even "device",
>> overloaded as it may be, because that would match the section name in
>> multipath.conf?
OK, done.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2017-04-13 23:56 ` Xose Vazquez Perez
@ 2017-04-14 8:29 ` Christophe Varoqui
0 siblings, 0 replies; 16+ messages in thread
From: Christophe Varoqui @ 2017-04-14 8:29 UTC (permalink / raw)
To: Xose Vazquez Perez; +Cc: device-mapper development
[-- Attachment #1.1: Type: text/plain, Size: 3526 bytes --]
Right,
pushed now.
Thanks,
Christophe.
On Fri, Apr 14, 2017 at 1:56 AM, Xose Vazquez Perez <xose.vazquez@gmail.com>
wrote:
> On 04/12/2017 09:35 AM, Christophe Varoqui wrote:
>
> > Merged,
>
> No, it's missing.
>
> > On Sat, Apr 8, 2017 at 3:30 PM, Xose Vazquez Perez <
> xose.vazquez@gmail.com <mailto:xose.vazquez@gmail.com>> wrote:
> >
> > Cc: Christophe Varoqui <christophe.varoqui@opensvc.com <mailto:
> christophe.varoqui@opensvc.com>>
> > Cc: device-mapper development <dm-devel@redhat.com <mailto:
> dm-devel@redhat.com>>
> > Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com <mailto:
> xose.vazquez@gmail.com>>
> > ---
> > libmultipath/propsel.c | 12 ++++++------
> > 1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> > index dd10ceb..5f70d86 100644
> > --- a/libmultipath/propsel.c
> > +++ b/libmultipath/propsel.c
> > @@ -162,7 +162,7 @@ int select_pgpolicy(struct config *conf, struct
> multipath * mp)
> >
> > if (conf->pgpolicy_flag > 0) {
> > mp->pgpolicy = conf->pgpolicy_flag;
> > - origin = "(cmd line flag)";
> > + origin = "(setting: multipath command line [-p]
> flag)";
> > goto out;
> > }
> > mp_set_mpe(pgpolicy);
> > @@ -251,18 +251,18 @@ int select_alias(struct config *conf, struct
> multipath * mp)
> > mp->alias_old, mp->alias_prefix,
> > conf->bindings_read_only);
> > memset (mp->alias_old, 0, WWID_SIZE);
> > - origin = "(using existing alias)";
> > + origin = "(setting: using existing alias)";
> > }
> >
> > if (mp->alias == NULL) {
> > mp->alias = get_user_friendly_alias(mp->wwid,
> > conf->bindings_file,
> mp->alias_prefix, conf->bindings_read_only);
> > - origin = "(user_friendly_name)";
> > + origin = "(setting: user_friendly_name)";
> > }
> > out:
> > if (mp->alias == NULL) {
> > mp->alias = STRDUP(mp->wwid);
> > - origin = "(default to wwid)";
> > + origin = "(setting: default to WWID)";
> > }
> > if (mp->alias)
> > condlog(3, "%s: alias = %s %s", mp->wwid, mp->alias,
> origin);
> > @@ -565,7 +565,7 @@ int select_retain_hwhandler(struct config *conf,
> struct multipath *mp)
> >
> > if (!VERSION_GE(conf->version, minv_dm_retain)) {
> > mp->retain_hwhandler = RETAIN_HWHANDLER_OFF;
> > - origin = "(requires kernel version >= 1.5.0)";
> > + origin = "(setting: WARNING, requires kernel version
> >= 1.5.0)";
> > goto out;
> > }
> > mp_set_ovr(retain_hwhandler);
> > @@ -614,7 +614,7 @@ int select_deferred_remove(struct config *conf,
> struct multipath *mp)
> >
> > #ifndef LIBDM_API_DEFERRED
> > mp->deferred_remove = DEFERRED_REMOVE_OFF;
> > - origin = "(not compiled with support)";
> > + origin = "(setting: WARNING, not compiled with support)";
> > goto out;
> > #endif
> > if (mp->deferred_remove == DEFERRED_REMOVE_IN_PROGRESS) {
> > --
> > 2.12.2
> >
> >
>
>
[-- Attachment #1.2: Type: text/html, Size: 5387 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2017-04-12 7:35 ` Christophe Varoqui
@ 2017-04-13 23:56 ` Xose Vazquez Perez
2017-04-14 8:29 ` Christophe Varoqui
0 siblings, 1 reply; 16+ messages in thread
From: Xose Vazquez Perez @ 2017-04-13 23:56 UTC (permalink / raw)
To: Christophe Varoqui; +Cc: device-mapper development
On 04/12/2017 09:35 AM, Christophe Varoqui wrote:
> Merged,
No, it's missing.
> On Sat, Apr 8, 2017 at 3:30 PM, Xose Vazquez Perez <xose.vazquez@gmail.com <mailto:xose.vazquez@gmail.com>> wrote:
>
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com <mailto:christophe.varoqui@opensvc.com>>
> Cc: device-mapper development <dm-devel@redhat.com <mailto:dm-devel@redhat.com>>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com <mailto:xose.vazquez@gmail.com>>
> ---
> libmultipath/propsel.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> index dd10ceb..5f70d86 100644
> --- a/libmultipath/propsel.c
> +++ b/libmultipath/propsel.c
> @@ -162,7 +162,7 @@ int select_pgpolicy(struct config *conf, struct multipath * mp)
>
> if (conf->pgpolicy_flag > 0) {
> mp->pgpolicy = conf->pgpolicy_flag;
> - origin = "(cmd line flag)";
> + origin = "(setting: multipath command line [-p] flag)";
> goto out;
> }
> mp_set_mpe(pgpolicy);
> @@ -251,18 +251,18 @@ int select_alias(struct config *conf, struct multipath * mp)
> mp->alias_old, mp->alias_prefix,
> conf->bindings_read_only);
> memset (mp->alias_old, 0, WWID_SIZE);
> - origin = "(using existing alias)";
> + origin = "(setting: using existing alias)";
> }
>
> if (mp->alias == NULL) {
> mp->alias = get_user_friendly_alias(mp->wwid,
> conf->bindings_file, mp->alias_prefix, conf->bindings_read_only);
> - origin = "(user_friendly_name)";
> + origin = "(setting: user_friendly_name)";
> }
> out:
> if (mp->alias == NULL) {
> mp->alias = STRDUP(mp->wwid);
> - origin = "(default to wwid)";
> + origin = "(setting: default to WWID)";
> }
> if (mp->alias)
> condlog(3, "%s: alias = %s %s", mp->wwid, mp->alias, origin);
> @@ -565,7 +565,7 @@ int select_retain_hwhandler(struct config *conf, struct multipath *mp)
>
> if (!VERSION_GE(conf->version, minv_dm_retain)) {
> mp->retain_hwhandler = RETAIN_HWHANDLER_OFF;
> - origin = "(requires kernel version >= 1.5.0)";
> + origin = "(setting: WARNING, requires kernel version >= 1.5.0)";
> goto out;
> }
> mp_set_ovr(retain_hwhandler);
> @@ -614,7 +614,7 @@ int select_deferred_remove(struct config *conf, struct multipath *mp)
>
> #ifndef LIBDM_API_DEFERRED
> mp->deferred_remove = DEFERRED_REMOVE_OFF;
> - origin = "(not compiled with support)";
> + origin = "(setting: WARNING, not compiled with support)";
> goto out;
> #endif
> if (mp->deferred_remove == DEFERRED_REMOVE_IN_PROGRESS) {
> --
> 2.12.2
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2017-04-08 13:30 [PATCH] multipath-tools: replace " Xose Vazquez Perez
@ 2017-04-12 7:35 ` Christophe Varoqui
2017-04-13 23:56 ` Xose Vazquez Perez
0 siblings, 1 reply; 16+ messages in thread
From: Christophe Varoqui @ 2017-04-12 7:35 UTC (permalink / raw)
To: Xose Vazquez Perez; +Cc: device-mapper development
[-- Attachment #1.1: Type: text/plain, Size: 2813 bytes --]
Merged,
thanks.
On Sat, Apr 8, 2017 at 3:30 PM, Xose Vazquez Perez <xose.vazquez@gmail.com>
wrote:
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: device-mapper development <dm-devel@redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
> libmultipath/propsel.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> index dd10ceb..5f70d86 100644
> --- a/libmultipath/propsel.c
> +++ b/libmultipath/propsel.c
> @@ -162,7 +162,7 @@ int select_pgpolicy(struct config *conf, struct
> multipath * mp)
>
> if (conf->pgpolicy_flag > 0) {
> mp->pgpolicy = conf->pgpolicy_flag;
> - origin = "(cmd line flag)";
> + origin = "(setting: multipath command line [-p] flag)";
> goto out;
> }
> mp_set_mpe(pgpolicy);
> @@ -251,18 +251,18 @@ int select_alias(struct config *conf, struct
> multipath * mp)
> mp->alias_old, mp->alias_prefix,
> conf->bindings_read_only);
> memset (mp->alias_old, 0, WWID_SIZE);
> - origin = "(using existing alias)";
> + origin = "(setting: using existing alias)";
> }
>
> if (mp->alias == NULL) {
> mp->alias = get_user_friendly_alias(mp->wwid,
> conf->bindings_file, mp->alias_prefix,
> conf->bindings_read_only);
> - origin = "(user_friendly_name)";
> + origin = "(setting: user_friendly_name)";
> }
> out:
> if (mp->alias == NULL) {
> mp->alias = STRDUP(mp->wwid);
> - origin = "(default to wwid)";
> + origin = "(setting: default to WWID)";
> }
> if (mp->alias)
> condlog(3, "%s: alias = %s %s", mp->wwid, mp->alias,
> origin);
> @@ -565,7 +565,7 @@ int select_retain_hwhandler(struct config *conf,
> struct multipath *mp)
>
> if (!VERSION_GE(conf->version, minv_dm_retain)) {
> mp->retain_hwhandler = RETAIN_HWHANDLER_OFF;
> - origin = "(requires kernel version >= 1.5.0)";
> + origin = "(setting: WARNING, requires kernel version >=
> 1.5.0)";
> goto out;
> }
> mp_set_ovr(retain_hwhandler);
> @@ -614,7 +614,7 @@ int select_deferred_remove(struct config *conf, struct
> multipath *mp)
>
> #ifndef LIBDM_API_DEFERRED
> mp->deferred_remove = DEFERRED_REMOVE_OFF;
> - origin = "(not compiled with support)";
> + origin = "(setting: WARNING, not compiled with support)";
> goto out;
> #endif
> if (mp->deferred_remove == DEFERRED_REMOVE_IN_PROGRESS) {
> --
> 2.12.2
>
>
[-- Attachment #1.2: Type: text/html, Size: 3994 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] multipath-tools: replace multipath configuration output
@ 2017-04-08 13:30 Xose Vazquez Perez
2017-04-12 7:35 ` Christophe Varoqui
0 siblings, 1 reply; 16+ messages in thread
From: Xose Vazquez Perez @ 2017-04-08 13:30 UTC (permalink / raw)
Cc: device-mapper development, Xose Vazquez Perez
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
libmultipath/propsel.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
index dd10ceb..5f70d86 100644
--- a/libmultipath/propsel.c
+++ b/libmultipath/propsel.c
@@ -162,7 +162,7 @@ int select_pgpolicy(struct config *conf, struct multipath * mp)
if (conf->pgpolicy_flag > 0) {
mp->pgpolicy = conf->pgpolicy_flag;
- origin = "(cmd line flag)";
+ origin = "(setting: multipath command line [-p] flag)";
goto out;
}
mp_set_mpe(pgpolicy);
@@ -251,18 +251,18 @@ int select_alias(struct config *conf, struct multipath * mp)
mp->alias_old, mp->alias_prefix,
conf->bindings_read_only);
memset (mp->alias_old, 0, WWID_SIZE);
- origin = "(using existing alias)";
+ origin = "(setting: using existing alias)";
}
if (mp->alias == NULL) {
mp->alias = get_user_friendly_alias(mp->wwid,
conf->bindings_file, mp->alias_prefix, conf->bindings_read_only);
- origin = "(user_friendly_name)";
+ origin = "(setting: user_friendly_name)";
}
out:
if (mp->alias == NULL) {
mp->alias = STRDUP(mp->wwid);
- origin = "(default to wwid)";
+ origin = "(setting: default to WWID)";
}
if (mp->alias)
condlog(3, "%s: alias = %s %s", mp->wwid, mp->alias, origin);
@@ -565,7 +565,7 @@ int select_retain_hwhandler(struct config *conf, struct multipath *mp)
if (!VERSION_GE(conf->version, minv_dm_retain)) {
mp->retain_hwhandler = RETAIN_HWHANDLER_OFF;
- origin = "(requires kernel version >= 1.5.0)";
+ origin = "(setting: WARNING, requires kernel version >= 1.5.0)";
goto out;
}
mp_set_ovr(retain_hwhandler);
@@ -614,7 +614,7 @@ int select_deferred_remove(struct config *conf, struct multipath *mp)
#ifndef LIBDM_API_DEFERRED
mp->deferred_remove = DEFERRED_REMOVE_OFF;
- origin = "(not compiled with support)";
+ origin = "(setting: WARNING, not compiled with support)";
goto out;
#endif
if (mp->deferred_remove == DEFERRED_REMOVE_IN_PROGRESS) {
--
2.12.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2016-12-07 22:48 ` Xose Vazquez Perez
@ 2016-12-14 18:29 ` Christophe Varoqui
0 siblings, 0 replies; 16+ messages in thread
From: Christophe Varoqui @ 2016-12-14 18:29 UTC (permalink / raw)
To: Xose Vazquez Perez; +Cc: device-mapper development, Martin Wilck
[-- Attachment #1.1: Type: text/plain, Size: 397 bytes --]
Then merged.
Thanks for the work and the comments.
On Wed, Dec 7, 2016 at 11:48 PM, Xose Vazquez Perez <xose.vazquez@gmail.com>
wrote:
> On 12/02/2016 04:52 AM, Benjamin Marzinski wrote:
>
> > I don't really see the need for this change. But we wouldn't be pulling
> > it in until the next major RHEL release [...]
>
> BTW, do you(SUSE/RH) have any distro fixes/features pending for upstream?
>
[-- Attachment #1.2: Type: text/html, Size: 758 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2016-12-02 3:52 ` Benjamin Marzinski
@ 2016-12-07 22:48 ` Xose Vazquez Perez
2016-12-14 18:29 ` Christophe Varoqui
0 siblings, 1 reply; 16+ messages in thread
From: Xose Vazquez Perez @ 2016-12-07 22:48 UTC (permalink / raw)
To: Benjamin Marzinski, Hannes Reinecke, Martin Wilck
Cc: device-mapper development
On 12/02/2016 04:52 AM, Benjamin Marzinski wrote:
> I don't really see the need for this change. But we wouldn't be pulling
> it in until the next major RHEL release [...]
BTW, do you(SUSE/RH) have any distro fixes/features pending for upstream?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2016-12-07 15:44 ` Xose Vazquez Perez
@ 2016-12-07 16:17 ` Martin Wilck
[not found] ` <c78854cd-f7f2-77ef-2d19-a5ff236e9a37@gmail.com>
0 siblings, 1 reply; 16+ messages in thread
From: Martin Wilck @ 2016-12-07 16:17 UTC (permalink / raw)
To: Xose Vazquez Perez, dm-devel, Christophe Varoqui
On Wed, 2016-12-07 at 16:44 +0100, Xose Vazquez Perez wrote:
> On 11/25/2016 10:00 AM, Martin Wilck wrote:
>
> > I am not sure I see the merit of these changes. If it's really
> > necessary to change the wording of the log messages which people
> > have
> > got used to, the new ones should be really more self-explanatory
> > than
> > the old ones.
>
> Some of them are a riddle, wrapped in a mystery, inside an enigma.
> For example "LUN setting". "setting: multipath.conf multipaths
> section"
> is, by far, a better description.
Agreed.
> > The common "setting: " formatting is nice but IMHO this alone
> > doesn't
> > really justify overthrowing old habits.
>
> I really don't care the marker name, "setting:" "conf:" ...
> But a standard one should be used.
Agreed.
> > On Thu, 2016-11-24 at 23:44 +0100, Xose Vazquez Perez wrote:
> > > sysfs setting -> setting: kernel sysfs
> > >
> > > detected setting -> setting: array autodetected
> > >
> > > controller setting -> setting: array configuration
> > Is "array" really more understandable to users than "controller"?
>
> "controller", what controller? local hba? array controller?
> "array" is unequivocal.
I tend to associate "array" with "RAID", and therefore I found this
term confusing. Perhaps "storage" or "storage array"? Or even "device",
overloaded as it may be, because that would match the section name in
multipath.conf?
> > These settings come from hwentries, so in reality they're either
> > part
> > of the built-in hwtable or of the multipath.conf "devices"
> > section,
> > or am I wrong here?
> Also from /sys fs, from the array or auto-negotiated kernel<->array.
> > It would be helpful for users to be able to distinguish which
> > config file section
> > the option was taken from (defaults/devices/multipaths/overrides).
> > The
> > same argument applies to the hardware enries - being able to
> > distinguish built in hardware defaults from config file "devices"
> > settings would be really helpful, but this patch doesn't provide
> > that
> > functionality.
>
> This is a first step. Anyhow only "multipath.conf defaults/devices"
> could be split.
> overrides and multipaths sections already are independent as you can
> see in
> libmultipath/propsel.c
OK.
>From an end user perspective, figuring out the "sysfs" and "auto-
negotiated" config option origin, as you mentioned above, might be most
important, in particular when these take precedence over config file
settings.
Anyway, thanks for putting thought into this.
Best Regards
Martin
--
Dr. Martin Wilck <mwilck@suse.com>, Tel. +49 (0)911 74053 2107
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2016-11-25 9:00 ` Martin Wilck
2016-11-26 9:21 ` Christophe Varoqui
@ 2016-12-07 15:44 ` Xose Vazquez Perez
2016-12-07 16:17 ` Martin Wilck
1 sibling, 1 reply; 16+ messages in thread
From: Xose Vazquez Perez @ 2016-12-07 15:44 UTC (permalink / raw)
To: Martin Wilck, dm-devel, Christophe Varoqui
On 11/25/2016 10:00 AM, Martin Wilck wrote:
> I am not sure I see the merit of these changes. If it's really
> necessary to change the wording of the log messages which people have
> got used to, the new ones should be really more self-explanatory than
> the old ones.
Some of them are a riddle, wrapped in a mystery, inside an enigma.
For example "LUN setting". "setting: multipath.conf multipaths section"
is, by far, a better description.
> The common "setting: " formatting is nice but IMHO this alone doesn't
> really justify overthrowing old habits.
I really don't care the marker name, "setting:" "conf:" ...
But a standard one should be used.
> On Thu, 2016-11-24 at 23:44 +0100, Xose Vazquez Perez wrote:
>> sysfs setting -> setting: kernel sysfs
>>
>> detected setting -> setting: array autodetected
>>
>> controller setting -> setting: array configuration
> Is "array" really more understandable to users than "controller"?
"controller", what controller? local hba? array controller?
"array" is unequivocal.
> These settings come from hwentries, so in reality they're either part
> of the built-in hwtable or of the multipath.conf "devices" section, or
> am I wrong here?
Also from /sys fs, from the array or auto-negotiated kernel<->array.
>> internal default -> setting: multipath internal
>>
>> overrides setting -> setting: multipath.conf overrides section
>>
>> LUN setting -> setting: multipath.conf multipaths section
>>
>> config file default
>> config file setting -> setting: multipath.conf defaults/devices
>> section
> Have you double-checked if this is correct for all options?
Yes. I don't do random patches.
> It would be helpful for users to be able to distinguish which config file section
> the option was taken from (defaults/devices/multipaths/overrides). The
> same argument applies to the hardware enries - being able to
> distinguish built in hardware defaults from config file "devices"
> settings would be really helpful, but this patch doesn't provide that
> functionality.
This is a first step. Anyhow only "multipath.conf defaults/devices" could be split.
overrides and multipaths sections already are independent as you can see in
libmultipath/propsel.c
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2016-11-26 9:21 ` Christophe Varoqui
@ 2016-12-02 3:52 ` Benjamin Marzinski
2016-12-07 22:48 ` Xose Vazquez Perez
0 siblings, 1 reply; 16+ messages in thread
From: Benjamin Marzinski @ 2016-12-02 3:52 UTC (permalink / raw)
To: Christophe Varoqui; +Cc: device-mapper development, Martin Wilck
On Sat, Nov 26, 2016 at 10:21:09AM +0100, Christophe Varoqui wrote:
> I also like the more structured wording you propose, and I can see how
> greping "setting:" can help.
> I'll wait a little longer to receive ack (not receive nack?) from
> distributors, as they face the annoyed users whose scripts break when we
> change our log strings format.
I don't really see the need for this change. But we wouldn't be pulling
it in until the next major RHEL release, and if the debug messages
change on a major relese, I'm not too worried about that. I can also see
the benefit of the "setting:" prefix, but in truth, I don't think anyone
looks at these except when something goes wrong, and in that case, they
are probably grepping for the option name anyway.
So, I'm not NACKing this, but I'm not pushing for it either. I really
don't care, one way or ther other.
-Ben
> Thanks.
> On Fri, Nov 25, 2016 at 10:00 AM, Martin Wilck <[1]mwilck@suse.com> wrote:
>
> I am not sure I see the merit of these changes. If it's really
> necessary to change the wording of the log messages which people have
> got used to, the new ones should be really more self-explanatory than
> the old ones.
>
> The common "setting: " formatting is nice but IMHO this alone doesn't
> really justify overthrowing old habits.
> On Thu, 2016-11-24 at 23:44 +0100, Xose Vazquez Perez wrote:
> > sysfs setting -> setting: kernel sysfs
> >
> > detected setting -> setting: array autodetected
> >
> > controller setting -> setting: array configuration
>
> Is "array" really more understandable to users than "controller"?
> These settings come from hwentries, so in reality they're either part
> of the built-in hwtable or of the multipath.conf "devices" section, or
> am I wrong here?
> > internal default -> setting: multipath internal
> >
> > overrides setting -> setting: multipath.conf overrides section
> >
> > LUN setting -> setting: multipath.conf multipaths section
> >
> > config file default
> > config file setting -> setting: multipath.conf defaults/devices
> > section
>
> Have you double-checked if this is correct for all options? It would be
> helpful for users to be able to distinguish which config file section
> the option was taken from (defaults/devices/multipaths/overrides). The
> same argument applies to the hardware enries - being able to
> distinguish built in hardware defaults from config file "devices"
> settings would be really helpful, but this patch doesn't provide that
> functionality.
>
> Regards
> Martin
>
> >
> >
> > Cc: Benjamin Marzinski <[2]bmarzins@redhat.com>
> > Cc: Hannes Reinecke <[3]hare@suse.de>
> > Cc: Christophe Varoqui <[4]christophe.varoqui@opensvc.com>
> > Cc: device-mapper development <[5]dm-devel@redhat.com>
> > Signed-off-by: Xose Vazquez Perez <[6]xose.vazquez@gmail.com>
> > ---
> > libmultipath/propsel.c | 66 +++++++++++++++++++++++++---------------
> > ----------
> > 1 file changed, 33 insertions(+), 33 deletions(-)
> >
> > diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> > index d1db7c3..c0bc616 100644
> > --- a/libmultipath/propsel.c
> > +++ b/libmultipath/propsel.c
> > @@ -41,28 +41,28 @@ do {
> > \
> > #define do_default(dest, value)
> > \
> > do {
> > \
> > dest = value;
> > \
> > - origin = "(internal default)";
> > \
> > + origin = "(setting: multipath internal)";
> > \
> > } while(0)
> >
> > #define mp_set_mpe(var)
> > \
> > -do_set(var, mp->mpe, mp->var, "(LUN setting)")
> > +do_set(var, mp->mpe, mp->var, "(setting: multipath.conf multipaths
> > section)")
> > #define mp_set_hwe(var)
> > \
> > -do_set(var, mp->hwe, mp->var, "(controller setting)")
> > +do_set(var, mp->hwe, mp->var, "(setting: array configuration)")
> > #define mp_set_ovr(var)
> > \
> > -do_set(var, conf->overrides, mp->var, "(overrides setting)")
> > +do_set(var, conf->overrides, mp->var, "(setting: multipath.conf
> > overrides section)")
> > #define mp_set_conf(var)
> > \
> > -do_set(var, conf, mp->var, "(config file default)")
> > +do_set(var, conf, mp->var, "(setting: multipath.conf
> > defaults/devices section)")
> > #define mp_set_default(var, value)
> > \
> > do_default(mp->var, value)
> >
> > #define pp_set_mpe(var)
> > \
> > -do_set(var, mpe, pp->var, "(LUN setting)")
> > +do_set(var, mpe, pp->var, "(setting: multipath.conf multipaths
> > section)")
> > #define pp_set_hwe(var)
> > \
> > -do_set(var, pp->hwe, pp->var, "(controller setting)")
> > +do_set(var, pp->hwe, pp->var, "(setting: array configuration)")
> > #define pp_set_conf(var)
> > \
> > -do_set(var, conf, pp->var, "(config file default)")
> > +do_set(var, conf, pp->var, "(setting: multipath.conf
> > defaults/devices section)")
> > #define pp_set_ovr(var)
> > \
> > -do_set(var, conf->overrides, pp->var, "(overrides setting)")
> > +do_set(var, conf->overrides, pp->var, "(setting: multipath.conf
> > overrides section)")
> > #define pp_set_default(var, value)
> > \
> > do_default(pp->var, value)
> >
> > @@ -77,9 +77,9 @@ do {
> > \
> > } while(0)
> >
> > #define set_attr_mpe(var, shift)
> > \
> > -do_attr_set(var, mp->mpe, shift, "(LUN setting)")
> > +do_attr_set(var, mp->mpe, shift, "(setting: multipath.conf
> > multipaths section)")
> > #define set_attr_conf(var, shift)
> > \
> > -do_attr_set(var, conf, shift, "(config file default)")
> > +do_attr_set(var, conf, shift, "(setting: multipath.conf
> > defaults/devices section)")
> >
> > int select_mode(struct config *conf, struct multipath *mp)
> > {
> > @@ -214,13 +214,13 @@ want_user_friendly_names(struct config *conf,
> > struct multipath * mp)
> > int user_friendly_names;
> >
> > do_set(user_friendly_names, mp->mpe, user_friendly_names,
> > - "(LUN setting)");
> > + "(setting: multipath.conf multipaths section)");
> > do_set(user_friendly_names, conf->overrides,
> > user_friendly_names,
> > - "(overrides setting)");
> > + "(setting: multipath.conf overrides section)");
> > do_set(user_friendly_names, mp->hwe, user_friendly_names,
> > - "(controller setting)");
> > + "(setting: array configuration)");
> > do_set(user_friendly_names, conf, user_friendly_names,
> > - "(config file setting)");
> > + "(setting: multipath.conf defaults/devices
> > section)");
> > do_default(user_friendly_names,
> > DEFAULT_USER_FRIENDLY_NAMES);
> > out:
> > condlog(3, "%s: user_friendly_names = %s %s", mp->wwid,
> > @@ -235,7 +235,7 @@ int select_alias(struct config *conf, struct
> > multipath * mp)
> >
> > if (mp->mpe && mp->mpe->alias) {
> > mp->alias = STRDUP(mp->mpe->alias);
> > - origin = "(LUN setting)";
> > + origin = "(setting: multipath.conf multipaths
> > section)";
> > goto out;
> > }
> >
> > @@ -312,24 +312,24 @@ int select_checker(struct config *conf, struct
> > path *pp)
> > char *origin, *checker_name;
> > struct checker * c = &pp->checker;
> >
> > - do_set(checker_name, conf->overrides, checker_name,
> > "(overrides setting)");
> > - do_set(checker_name, pp->hwe, checker_name, "(controller
> > setting)");
> > - do_set(checker_name, conf, checker_name, "(config file
> > setting)");
> > + do_set(checker_name, conf->overrides, checker_name,
> > "(setting: multipath.conf overrides section)");
> > + do_set(checker_name, pp->hwe, checker_name, "(setting: array
> > configuration)");
> > + do_set(checker_name, conf, checker_name, "(setting:
> > multipath.conf defaults/devices section)");
> > do_default(checker_name, DEFAULT_CHECKER);
> > out:
> > checker_get(conf->multipath_dir, c, checker_name);
> > condlog(3, "%s: path_checker = %s %s", pp->dev, c->name,
> > origin);
> > if (conf->checker_timeout) {
> > c->timeout = conf->checker_timeout;
> > - condlog(3, "%s: checker timeout = %u s (config file
> > default)",
> > + condlog(3, "%s: checker timeout = %u s (setting:
> > multipath.conf defaults/devices section)",
> > pp->dev, c->timeout);
> > }
> > else if (sysfs_get_timeout(pp, &c->timeout) > 0)
> > - condlog(3, "%s: checker timeout = %u ms (sysfs
> > setting)",
> > + condlog(3, "%s: checker timeout = %u ms (setting:
> > kernel sysfs)",
> > pp->dev, c->timeout);
> > else {
> > c->timeout = DEF_TIMEOUT;
> > - condlog(3, "%s: checker timeout = %u ms (internal
> > default)",
> > + condlog(3, "%s: checker timeout = %u ms (setting:
> > multipath internal)",
> > pp->dev, c->timeout);
> > }
> > return 0;
> > @@ -397,17 +397,17 @@ int select_prio(struct config *conf, struct
> > path *pp)
> > if (pp->detect_prio == DETECT_PRIO_ON) {
> > detect_prio(conf, pp);
> > if (prio_selected(p)) {
> > - origin = "(detected setting)";
> > + origin = "(setting: array autodetected)";
> > goto out;
> > }
> > }
> > mpe = find_mpe(conf->mptable, pp->wwid);
> > - set_prio(conf->multipath_dir, mpe, "(LUN setting)");
> > - set_prio(conf->multipath_dir, conf->overrides, "(overrides
> > setting)");
> > - set_prio(conf->multipath_dir, pp->hwe, "controller
> > setting)");
> > - set_prio(conf->multipath_dir, conf, "(config file
> > default)");
> > + set_prio(conf->multipath_dir, mpe, "(setting: multipath.conf
> > multipaths section)");
> > + set_prio(conf->multipath_dir, conf->overrides, "(setting:
> > multipath.conf overrides section)");
> > + set_prio(conf->multipath_dir, pp->hwe, "(setting: array
> > configuration)");
> > + set_prio(conf->multipath_dir, conf, "(setting:
> > multipath.conf defaults/devices section)");
> > prio_get(conf->multipath_dir, p, DEFAULT_PRIO,
> > DEFAULT_PRIO_ARGS);
> > - origin = "(internal default)";
> > + origin = "(setting: multipath internal)";
> > out:
> > /*
> > * fetch tpgs mode for alua, if its not already obtained
> > @@ -448,7 +448,7 @@ out:
> > condlog(3, "%s: no_path_retry = %s (inherited
> > setting)",
> > mp->alias, buff);
> > else
> > - condlog(3, "%s: no_path_retry = undef (internal
> > default)",
> > + condlog(3, "%s: no_path_retry = undef (setting:
> > multipath internal)",
> > mp->alias);
> > return 0;
> > }
> > @@ -458,10 +458,10 @@ select_minio_rq (struct config *conf, struct
> > multipath * mp)
> > {
> > char *origin;
> >
> > - do_set(minio_rq, mp->mpe, mp->minio, "(LUN setting)");
> > - do_set(minio_rq, conf->overrides, mp->minio, "(overrides
> > setting)");
> > - do_set(minio_rq, mp->hwe, mp->minio, "(controller
> > setting)");
> > - do_set(minio_rq, conf, mp->minio, "(config file setting)");
> > + do_set(minio_rq, mp->mpe, mp->minio, "(setting:
> > multipath.conf multipaths section)");
> > + do_set(minio_rq, conf->overrides, mp->minio, "(setting:
> > multipath.conf overrides section)");
> > + do_set(minio_rq, mp->hwe, mp->minio, "(setting: array
> > configuration)");
> > + do_set(minio_rq, conf, mp->minio, "(setting: multipath.conf
> > defaults/devices section)");
> > do_default(mp->minio, DEFAULT_MINIO_RQ);
> > out:
> > condlog(3, "%s: minio = %i %s", mp->alias, mp->minio,
> > origin);
>
> --
> Dr. Martin Wilck <[7]mwilck@suse.com>, Tel. [8]+49 (0)911 74053 2107
> SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton
> HRB 21284 (AG Nürnberg)
>
> --
> dm-devel mailing list
> [9]dm-devel@redhat.com
> [10]https://www.redhat.com/mailman/listinfo/dm-devel
>
> References
>
> Visible links
> 1. mailto:mwilck@suse.com
> 2. mailto:bmarzins@redhat.com
> 3. mailto:hare@suse.de
> 4. mailto:christophe.varoqui@opensvc.com
> 5. mailto:dm-devel@redhat.com
> 6. mailto:xose.vazquez@gmail.com
> 7. mailto:mwilck@suse.com
> 8. file:///tmp/tel:%2B49%20%280%29911%2074053%202107
> 9. mailto:dm-devel@redhat.com
> 10. https://www.redhat.com/mailman/listinfo/dm-devel
> --
> dm-devel mailing list
> dm-devel@redhat.com
> https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2016-11-25 9:00 ` Martin Wilck
@ 2016-11-26 9:21 ` Christophe Varoqui
2016-12-02 3:52 ` Benjamin Marzinski
2016-12-07 15:44 ` Xose Vazquez Perez
1 sibling, 1 reply; 16+ messages in thread
From: Christophe Varoqui @ 2016-11-26 9:21 UTC (permalink / raw)
To: Martin Wilck; +Cc: device-mapper development
[-- Attachment #1.1: Type: text/plain, Size: 11648 bytes --]
I also like the more structured wording you propose, and I can see how
greping "setting:" can help.
I'll wait a little longer to receive ack (not receive nack?) from
distributors, as they face the annoyed users whose scripts break when we
change our log strings format.
Thanks.
On Fri, Nov 25, 2016 at 10:00 AM, Martin Wilck <mwilck@suse.com> wrote:
> I am not sure I see the merit of these changes. If it's really
> necessary to change the wording of the log messages which people have
> got used to, the new ones should be really more self-explanatory than
> the old ones.
>
> The common "setting: " formatting is nice but IMHO this alone doesn't
> really justify overthrowing old habits.
>
> On Thu, 2016-11-24 at 23:44 +0100, Xose Vazquez Perez wrote:
> > sysfs setting -> setting: kernel sysfs
> >
> > detected setting -> setting: array autodetected
> >
> > controller setting -> setting: array configuration
>
> Is "array" really more understandable to users than "controller"?
> These settings come from hwentries, so in reality they're either part
> of the built-in hwtable or of the multipath.conf "devices" section, or
> am I wrong here?
>
> > internal default -> setting: multipath internal
> >
> > overrides setting -> setting: multipath.conf overrides section
> >
> > LUN setting -> setting: multipath.conf multipaths section
> >
> > config file default
> > config file setting -> setting: multipath.conf defaults/devices
> > section
>
> Have you double-checked if this is correct for all options? It would be
> helpful for users to be able to distinguish which config file section
> the option was taken from (defaults/devices/multipaths/overrides). The
> same argument applies to the hardware enries - being able to
> distinguish built in hardware defaults from config file "devices"
> settings would be really helpful, but this patch doesn't provide that
> functionality.
>
> Regards
> Martin
>
>
>
>
> >
> >
> > Cc: Benjamin Marzinski <bmarzins@redhat.com>
> > Cc: Hannes Reinecke <hare@suse.de>
> > Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> > Cc: device-mapper development <dm-devel@redhat.com>
> > Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> > ---
> > libmultipath/propsel.c | 66 +++++++++++++++++++++++++---------------
> > ----------
> > 1 file changed, 33 insertions(+), 33 deletions(-)
> >
> > diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> > index d1db7c3..c0bc616 100644
> > --- a/libmultipath/propsel.c
> > +++ b/libmultipath/propsel.c
> > @@ -41,28 +41,28 @@ do {
> > \
> > #define do_default(dest, value)
> > \
> > do {
> > \
> > dest = value;
> > \
> > - origin = "(internal default)";
> > \
> > + origin = "(setting: multipath internal)";
> > \
> > } while(0)
> >
> > #define mp_set_mpe(var)
> > \
> > -do_set(var, mp->mpe, mp->var, "(LUN setting)")
> > +do_set(var, mp->mpe, mp->var, "(setting: multipath.conf multipaths
> > section)")
> > #define mp_set_hwe(var)
> > \
> > -do_set(var, mp->hwe, mp->var, "(controller setting)")
> > +do_set(var, mp->hwe, mp->var, "(setting: array configuration)")
> > #define mp_set_ovr(var)
> > \
> > -do_set(var, conf->overrides, mp->var, "(overrides setting)")
> > +do_set(var, conf->overrides, mp->var, "(setting: multipath.conf
> > overrides section)")
> > #define mp_set_conf(var)
> > \
> > -do_set(var, conf, mp->var, "(config file default)")
> > +do_set(var, conf, mp->var, "(setting: multipath.conf
> > defaults/devices section)")
> > #define mp_set_default(var, value)
> > \
> > do_default(mp->var, value)
> >
> > #define pp_set_mpe(var)
> > \
> > -do_set(var, mpe, pp->var, "(LUN setting)")
> > +do_set(var, mpe, pp->var, "(setting: multipath.conf multipaths
> > section)")
> > #define pp_set_hwe(var)
> > \
> > -do_set(var, pp->hwe, pp->var, "(controller setting)")
> > +do_set(var, pp->hwe, pp->var, "(setting: array configuration)")
> > #define pp_set_conf(var)
> > \
> > -do_set(var, conf, pp->var, "(config file default)")
> > +do_set(var, conf, pp->var, "(setting: multipath.conf
> > defaults/devices section)")
> > #define pp_set_ovr(var)
> > \
> > -do_set(var, conf->overrides, pp->var, "(overrides setting)")
> > +do_set(var, conf->overrides, pp->var, "(setting: multipath.conf
> > overrides section)")
> > #define pp_set_default(var, value)
> > \
> > do_default(pp->var, value)
> >
> > @@ -77,9 +77,9 @@ do {
> > \
> > } while(0)
> >
> > #define set_attr_mpe(var, shift)
> > \
> > -do_attr_set(var, mp->mpe, shift, "(LUN setting)")
> > +do_attr_set(var, mp->mpe, shift, "(setting: multipath.conf
> > multipaths section)")
> > #define set_attr_conf(var, shift)
> > \
> > -do_attr_set(var, conf, shift, "(config file default)")
> > +do_attr_set(var, conf, shift, "(setting: multipath.conf
> > defaults/devices section)")
> >
> > int select_mode(struct config *conf, struct multipath *mp)
> > {
> > @@ -214,13 +214,13 @@ want_user_friendly_names(struct config *conf,
> > struct multipath * mp)
> > int user_friendly_names;
> >
> > do_set(user_friendly_names, mp->mpe, user_friendly_names,
> > - "(LUN setting)");
> > + "(setting: multipath.conf multipaths section)");
> > do_set(user_friendly_names, conf->overrides,
> > user_friendly_names,
> > - "(overrides setting)");
> > + "(setting: multipath.conf overrides section)");
> > do_set(user_friendly_names, mp->hwe, user_friendly_names,
> > - "(controller setting)");
> > + "(setting: array configuration)");
> > do_set(user_friendly_names, conf, user_friendly_names,
> > - "(config file setting)");
> > + "(setting: multipath.conf defaults/devices
> > section)");
> > do_default(user_friendly_names,
> > DEFAULT_USER_FRIENDLY_NAMES);
> > out:
> > condlog(3, "%s: user_friendly_names = %s %s", mp->wwid,
> > @@ -235,7 +235,7 @@ int select_alias(struct config *conf, struct
> > multipath * mp)
> >
> > if (mp->mpe && mp->mpe->alias) {
> > mp->alias = STRDUP(mp->mpe->alias);
> > - origin = "(LUN setting)";
> > + origin = "(setting: multipath.conf multipaths
> > section)";
> > goto out;
> > }
> >
> > @@ -312,24 +312,24 @@ int select_checker(struct config *conf, struct
> > path *pp)
> > char *origin, *checker_name;
> > struct checker * c = &pp->checker;
> >
> > - do_set(checker_name, conf->overrides, checker_name,
> > "(overrides setting)");
> > - do_set(checker_name, pp->hwe, checker_name, "(controller
> > setting)");
> > - do_set(checker_name, conf, checker_name, "(config file
> > setting)");
> > + do_set(checker_name, conf->overrides, checker_name,
> > "(setting: multipath.conf overrides section)");
> > + do_set(checker_name, pp->hwe, checker_name, "(setting: array
> > configuration)");
> > + do_set(checker_name, conf, checker_name, "(setting:
> > multipath.conf defaults/devices section)");
> > do_default(checker_name, DEFAULT_CHECKER);
> > out:
> > checker_get(conf->multipath_dir, c, checker_name);
> > condlog(3, "%s: path_checker = %s %s", pp->dev, c->name,
> > origin);
> > if (conf->checker_timeout) {
> > c->timeout = conf->checker_timeout;
> > - condlog(3, "%s: checker timeout = %u s (config file
> > default)",
> > + condlog(3, "%s: checker timeout = %u s (setting:
> > multipath.conf defaults/devices section)",
> > pp->dev, c->timeout);
> > }
> > else if (sysfs_get_timeout(pp, &c->timeout) > 0)
> > - condlog(3, "%s: checker timeout = %u ms (sysfs
> > setting)",
> > + condlog(3, "%s: checker timeout = %u ms (setting:
> > kernel sysfs)",
> > pp->dev, c->timeout);
> > else {
> > c->timeout = DEF_TIMEOUT;
> > - condlog(3, "%s: checker timeout = %u ms (internal
> > default)",
> > + condlog(3, "%s: checker timeout = %u ms (setting:
> > multipath internal)",
> > pp->dev, c->timeout);
> > }
> > return 0;
> > @@ -397,17 +397,17 @@ int select_prio(struct config *conf, struct
> > path *pp)
> > if (pp->detect_prio == DETECT_PRIO_ON) {
> > detect_prio(conf, pp);
> > if (prio_selected(p)) {
> > - origin = "(detected setting)";
> > + origin = "(setting: array autodetected)";
> > goto out;
> > }
> > }
> > mpe = find_mpe(conf->mptable, pp->wwid);
> > - set_prio(conf->multipath_dir, mpe, "(LUN setting)");
> > - set_prio(conf->multipath_dir, conf->overrides, "(overrides
> > setting)");
> > - set_prio(conf->multipath_dir, pp->hwe, "controller
> > setting)");
> > - set_prio(conf->multipath_dir, conf, "(config file
> > default)");
> > + set_prio(conf->multipath_dir, mpe, "(setting: multipath.conf
> > multipaths section)");
> > + set_prio(conf->multipath_dir, conf->overrides, "(setting:
> > multipath.conf overrides section)");
> > + set_prio(conf->multipath_dir, pp->hwe, "(setting: array
> > configuration)");
> > + set_prio(conf->multipath_dir, conf, "(setting:
> > multipath.conf defaults/devices section)");
> > prio_get(conf->multipath_dir, p, DEFAULT_PRIO,
> > DEFAULT_PRIO_ARGS);
> > - origin = "(internal default)";
> > + origin = "(setting: multipath internal)";
> > out:
> > /*
> > * fetch tpgs mode for alua, if its not already obtained
> > @@ -448,7 +448,7 @@ out:
> > condlog(3, "%s: no_path_retry = %s (inherited
> > setting)",
> > mp->alias, buff);
> > else
> > - condlog(3, "%s: no_path_retry = undef (internal
> > default)",
> > + condlog(3, "%s: no_path_retry = undef (setting:
> > multipath internal)",
> > mp->alias);
> > return 0;
> > }
> > @@ -458,10 +458,10 @@ select_minio_rq (struct config *conf, struct
> > multipath * mp)
> > {
> > char *origin;
> >
> > - do_set(minio_rq, mp->mpe, mp->minio, "(LUN setting)");
> > - do_set(minio_rq, conf->overrides, mp->minio, "(overrides
> > setting)");
> > - do_set(minio_rq, mp->hwe, mp->minio, "(controller
> > setting)");
> > - do_set(minio_rq, conf, mp->minio, "(config file setting)");
> > + do_set(minio_rq, mp->mpe, mp->minio, "(setting:
> > multipath.conf multipaths section)");
> > + do_set(minio_rq, conf->overrides, mp->minio, "(setting:
> > multipath.conf overrides section)");
> > + do_set(minio_rq, mp->hwe, mp->minio, "(setting: array
> > configuration)");
> > + do_set(minio_rq, conf, mp->minio, "(setting: multipath.conf
> > defaults/devices section)");
> > do_default(mp->minio, DEFAULT_MINIO_RQ);
> > out:
> > condlog(3, "%s: minio = %i %s", mp->alias, mp->minio,
> > origin);
>
> --
> Dr. Martin Wilck <mwilck@suse.com>, Tel. +49 (0)911 74053 2107
> SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton
> HRB 21284 (AG Nürnberg)
>
> --
> dm-devel mailing list
> dm-devel@redhat.com
> https://www.redhat.com/mailman/listinfo/dm-devel
[-- Attachment #1.2: Type: text/html, Size: 15742 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] multipath-tools: replace multipath configuration output
2016-11-24 22:44 Xose Vazquez Perez
@ 2016-11-25 9:00 ` Martin Wilck
2016-11-26 9:21 ` Christophe Varoqui
2016-12-07 15:44 ` Xose Vazquez Perez
0 siblings, 2 replies; 16+ messages in thread
From: Martin Wilck @ 2016-11-25 9:00 UTC (permalink / raw)
To: dm-devel
I am not sure I see the merit of these changes. If it's really
necessary to change the wording of the log messages which people have
got used to, the new ones should be really more self-explanatory than
the old ones.
The common "setting: " formatting is nice but IMHO this alone doesn't
really justify overthrowing old habits.
On Thu, 2016-11-24 at 23:44 +0100, Xose Vazquez Perez wrote:
> sysfs setting -> setting: kernel sysfs
>
> detected setting -> setting: array autodetected
>
> controller setting -> setting: array configuration
Is "array" really more understandable to users than "controller"?
These settings come from hwentries, so in reality they're either part
of the built-in hwtable or of the multipath.conf "devices" section, or
am I wrong here?
> internal default -> setting: multipath internal
>
> overrides setting -> setting: multipath.conf overrides section
>
> LUN setting -> setting: multipath.conf multipaths section
>
> config file default
> config file setting -> setting: multipath.conf defaults/devices
> section
Have you double-checked if this is correct for all options? It would be
helpful for users to be able to distinguish which config file section
the option was taken from (defaults/devices/multipaths/overrides). The
same argument applies to the hardware enries - being able to
distinguish built in hardware defaults from config file "devices"
settings would be really helpful, but this patch doesn't provide that
functionality.
Regards
Martin
>
>
> Cc: Benjamin Marzinski <bmarzins@redhat.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: device-mapper development <dm-devel@redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
> libmultipath/propsel.c | 66 +++++++++++++++++++++++++---------------
> ----------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
> index d1db7c3..c0bc616 100644
> --- a/libmultipath/propsel.c
> +++ b/libmultipath/propsel.c
> @@ -41,28 +41,28 @@ do {
> \
> #define do_default(dest, value)
> \
> do {
> \
> dest = value;
> \
> - origin = "(internal default)";
> \
> + origin = "(setting: multipath internal)";
> \
> } while(0)
>
> #define mp_set_mpe(var)
> \
> -do_set(var, mp->mpe, mp->var, "(LUN setting)")
> +do_set(var, mp->mpe, mp->var, "(setting: multipath.conf multipaths
> section)")
> #define mp_set_hwe(var)
> \
> -do_set(var, mp->hwe, mp->var, "(controller setting)")
> +do_set(var, mp->hwe, mp->var, "(setting: array configuration)")
> #define mp_set_ovr(var)
> \
> -do_set(var, conf->overrides, mp->var, "(overrides setting)")
> +do_set(var, conf->overrides, mp->var, "(setting: multipath.conf
> overrides section)")
> #define mp_set_conf(var)
> \
> -do_set(var, conf, mp->var, "(config file default)")
> +do_set(var, conf, mp->var, "(setting: multipath.conf
> defaults/devices section)")
> #define mp_set_default(var, value)
> \
> do_default(mp->var, value)
>
> #define pp_set_mpe(var)
> \
> -do_set(var, mpe, pp->var, "(LUN setting)")
> +do_set(var, mpe, pp->var, "(setting: multipath.conf multipaths
> section)")
> #define pp_set_hwe(var)
> \
> -do_set(var, pp->hwe, pp->var, "(controller setting)")
> +do_set(var, pp->hwe, pp->var, "(setting: array configuration)")
> #define pp_set_conf(var)
> \
> -do_set(var, conf, pp->var, "(config file default)")
> +do_set(var, conf, pp->var, "(setting: multipath.conf
> defaults/devices section)")
> #define pp_set_ovr(var)
> \
> -do_set(var, conf->overrides, pp->var, "(overrides setting)")
> +do_set(var, conf->overrides, pp->var, "(setting: multipath.conf
> overrides section)")
> #define pp_set_default(var, value)
> \
> do_default(pp->var, value)
>
> @@ -77,9 +77,9 @@ do {
> \
> } while(0)
>
> #define set_attr_mpe(var, shift)
> \
> -do_attr_set(var, mp->mpe, shift, "(LUN setting)")
> +do_attr_set(var, mp->mpe, shift, "(setting: multipath.conf
> multipaths section)")
> #define set_attr_conf(var, shift)
> \
> -do_attr_set(var, conf, shift, "(config file default)")
> +do_attr_set(var, conf, shift, "(setting: multipath.conf
> defaults/devices section)")
>
> int select_mode(struct config *conf, struct multipath *mp)
> {
> @@ -214,13 +214,13 @@ want_user_friendly_names(struct config *conf,
> struct multipath * mp)
> int user_friendly_names;
>
> do_set(user_friendly_names, mp->mpe, user_friendly_names,
> - "(LUN setting)");
> + "(setting: multipath.conf multipaths section)");
> do_set(user_friendly_names, conf->overrides,
> user_friendly_names,
> - "(overrides setting)");
> + "(setting: multipath.conf overrides section)");
> do_set(user_friendly_names, mp->hwe, user_friendly_names,
> - "(controller setting)");
> + "(setting: array configuration)");
> do_set(user_friendly_names, conf, user_friendly_names,
> - "(config file setting)");
> + "(setting: multipath.conf defaults/devices
> section)");
> do_default(user_friendly_names,
> DEFAULT_USER_FRIENDLY_NAMES);
> out:
> condlog(3, "%s: user_friendly_names = %s %s", mp->wwid,
> @@ -235,7 +235,7 @@ int select_alias(struct config *conf, struct
> multipath * mp)
>
> if (mp->mpe && mp->mpe->alias) {
> mp->alias = STRDUP(mp->mpe->alias);
> - origin = "(LUN setting)";
> + origin = "(setting: multipath.conf multipaths
> section)";
> goto out;
> }
>
> @@ -312,24 +312,24 @@ int select_checker(struct config *conf, struct
> path *pp)
> char *origin, *checker_name;
> struct checker * c = &pp->checker;
>
> - do_set(checker_name, conf->overrides, checker_name,
> "(overrides setting)");
> - do_set(checker_name, pp->hwe, checker_name, "(controller
> setting)");
> - do_set(checker_name, conf, checker_name, "(config file
> setting)");
> + do_set(checker_name, conf->overrides, checker_name,
> "(setting: multipath.conf overrides section)");
> + do_set(checker_name, pp->hwe, checker_name, "(setting: array
> configuration)");
> + do_set(checker_name, conf, checker_name, "(setting:
> multipath.conf defaults/devices section)");
> do_default(checker_name, DEFAULT_CHECKER);
> out:
> checker_get(conf->multipath_dir, c, checker_name);
> condlog(3, "%s: path_checker = %s %s", pp->dev, c->name,
> origin);
> if (conf->checker_timeout) {
> c->timeout = conf->checker_timeout;
> - condlog(3, "%s: checker timeout = %u s (config file
> default)",
> + condlog(3, "%s: checker timeout = %u s (setting:
> multipath.conf defaults/devices section)",
> pp->dev, c->timeout);
> }
> else if (sysfs_get_timeout(pp, &c->timeout) > 0)
> - condlog(3, "%s: checker timeout = %u ms (sysfs
> setting)",
> + condlog(3, "%s: checker timeout = %u ms (setting:
> kernel sysfs)",
> pp->dev, c->timeout);
> else {
> c->timeout = DEF_TIMEOUT;
> - condlog(3, "%s: checker timeout = %u ms (internal
> default)",
> + condlog(3, "%s: checker timeout = %u ms (setting:
> multipath internal)",
> pp->dev, c->timeout);
> }
> return 0;
> @@ -397,17 +397,17 @@ int select_prio(struct config *conf, struct
> path *pp)
> if (pp->detect_prio == DETECT_PRIO_ON) {
> detect_prio(conf, pp);
> if (prio_selected(p)) {
> - origin = "(detected setting)";
> + origin = "(setting: array autodetected)";
> goto out;
> }
> }
> mpe = find_mpe(conf->mptable, pp->wwid);
> - set_prio(conf->multipath_dir, mpe, "(LUN setting)");
> - set_prio(conf->multipath_dir, conf->overrides, "(overrides
> setting)");
> - set_prio(conf->multipath_dir, pp->hwe, "controller
> setting)");
> - set_prio(conf->multipath_dir, conf, "(config file
> default)");
> + set_prio(conf->multipath_dir, mpe, "(setting: multipath.conf
> multipaths section)");
> + set_prio(conf->multipath_dir, conf->overrides, "(setting:
> multipath.conf overrides section)");
> + set_prio(conf->multipath_dir, pp->hwe, "(setting: array
> configuration)");
> + set_prio(conf->multipath_dir, conf, "(setting:
> multipath.conf defaults/devices section)");
> prio_get(conf->multipath_dir, p, DEFAULT_PRIO,
> DEFAULT_PRIO_ARGS);
> - origin = "(internal default)";
> + origin = "(setting: multipath internal)";
> out:
> /*
> * fetch tpgs mode for alua, if its not already obtained
> @@ -448,7 +448,7 @@ out:
> condlog(3, "%s: no_path_retry = %s (inherited
> setting)",
> mp->alias, buff);
> else
> - condlog(3, "%s: no_path_retry = undef (internal
> default)",
> + condlog(3, "%s: no_path_retry = undef (setting:
> multipath internal)",
> mp->alias);
> return 0;
> }
> @@ -458,10 +458,10 @@ select_minio_rq (struct config *conf, struct
> multipath * mp)
> {
> char *origin;
>
> - do_set(minio_rq, mp->mpe, mp->minio, "(LUN setting)");
> - do_set(minio_rq, conf->overrides, mp->minio, "(overrides
> setting)");
> - do_set(minio_rq, mp->hwe, mp->minio, "(controller
> setting)");
> - do_set(minio_rq, conf, mp->minio, "(config file setting)");
> + do_set(minio_rq, mp->mpe, mp->minio, "(setting:
> multipath.conf multipaths section)");
> + do_set(minio_rq, conf->overrides, mp->minio, "(setting:
> multipath.conf overrides section)");
> + do_set(minio_rq, mp->hwe, mp->minio, "(setting: array
> configuration)");
> + do_set(minio_rq, conf, mp->minio, "(setting: multipath.conf
> defaults/devices section)");
> do_default(mp->minio, DEFAULT_MINIO_RQ);
> out:
> condlog(3, "%s: minio = %i %s", mp->alias, mp->minio,
> origin);
--
Dr. Martin Wilck <mwilck@suse.com>, Tel. +49 (0)911 74053 2107
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] multipath-tools: replace multipath configuration output
@ 2016-11-24 22:44 Xose Vazquez Perez
2016-11-25 9:00 ` Martin Wilck
0 siblings, 1 reply; 16+ messages in thread
From: Xose Vazquez Perez @ 2016-11-24 22:44 UTC (permalink / raw)
Cc: Xose Vazquez Perez, device-mapper development
sysfs setting -> setting: kernel sysfs
detected setting -> setting: array autodetected
controller setting -> setting: array configuration
internal default -> setting: multipath internal
overrides setting -> setting: multipath.conf overrides section
LUN setting -> setting: multipath.conf multipaths section
config file default
config file setting -> setting: multipath.conf defaults/devices section
Cc: Benjamin Marzinski <bmarzins@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
libmultipath/propsel.c | 66 +++++++++++++++++++++++++-------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
index d1db7c3..c0bc616 100644
--- a/libmultipath/propsel.c
+++ b/libmultipath/propsel.c
@@ -41,28 +41,28 @@ do { \
#define do_default(dest, value) \
do { \
dest = value; \
- origin = "(internal default)"; \
+ origin = "(setting: multipath internal)"; \
} while(0)
#define mp_set_mpe(var) \
-do_set(var, mp->mpe, mp->var, "(LUN setting)")
+do_set(var, mp->mpe, mp->var, "(setting: multipath.conf multipaths section)")
#define mp_set_hwe(var) \
-do_set(var, mp->hwe, mp->var, "(controller setting)")
+do_set(var, mp->hwe, mp->var, "(setting: array configuration)")
#define mp_set_ovr(var) \
-do_set(var, conf->overrides, mp->var, "(overrides setting)")
+do_set(var, conf->overrides, mp->var, "(setting: multipath.conf overrides section)")
#define mp_set_conf(var) \
-do_set(var, conf, mp->var, "(config file default)")
+do_set(var, conf, mp->var, "(setting: multipath.conf defaults/devices section)")
#define mp_set_default(var, value) \
do_default(mp->var, value)
#define pp_set_mpe(var) \
-do_set(var, mpe, pp->var, "(LUN setting)")
+do_set(var, mpe, pp->var, "(setting: multipath.conf multipaths section)")
#define pp_set_hwe(var) \
-do_set(var, pp->hwe, pp->var, "(controller setting)")
+do_set(var, pp->hwe, pp->var, "(setting: array configuration)")
#define pp_set_conf(var) \
-do_set(var, conf, pp->var, "(config file default)")
+do_set(var, conf, pp->var, "(setting: multipath.conf defaults/devices section)")
#define pp_set_ovr(var) \
-do_set(var, conf->overrides, pp->var, "(overrides setting)")
+do_set(var, conf->overrides, pp->var, "(setting: multipath.conf overrides section)")
#define pp_set_default(var, value) \
do_default(pp->var, value)
@@ -77,9 +77,9 @@ do { \
} while(0)
#define set_attr_mpe(var, shift) \
-do_attr_set(var, mp->mpe, shift, "(LUN setting)")
+do_attr_set(var, mp->mpe, shift, "(setting: multipath.conf multipaths section)")
#define set_attr_conf(var, shift) \
-do_attr_set(var, conf, shift, "(config file default)")
+do_attr_set(var, conf, shift, "(setting: multipath.conf defaults/devices section)")
int select_mode(struct config *conf, struct multipath *mp)
{
@@ -214,13 +214,13 @@ want_user_friendly_names(struct config *conf, struct multipath * mp)
int user_friendly_names;
do_set(user_friendly_names, mp->mpe, user_friendly_names,
- "(LUN setting)");
+ "(setting: multipath.conf multipaths section)");
do_set(user_friendly_names, conf->overrides, user_friendly_names,
- "(overrides setting)");
+ "(setting: multipath.conf overrides section)");
do_set(user_friendly_names, mp->hwe, user_friendly_names,
- "(controller setting)");
+ "(setting: array configuration)");
do_set(user_friendly_names, conf, user_friendly_names,
- "(config file setting)");
+ "(setting: multipath.conf defaults/devices section)");
do_default(user_friendly_names, DEFAULT_USER_FRIENDLY_NAMES);
out:
condlog(3, "%s: user_friendly_names = %s %s", mp->wwid,
@@ -235,7 +235,7 @@ int select_alias(struct config *conf, struct multipath * mp)
if (mp->mpe && mp->mpe->alias) {
mp->alias = STRDUP(mp->mpe->alias);
- origin = "(LUN setting)";
+ origin = "(setting: multipath.conf multipaths section)";
goto out;
}
@@ -312,24 +312,24 @@ int select_checker(struct config *conf, struct path *pp)
char *origin, *checker_name;
struct checker * c = &pp->checker;
- do_set(checker_name, conf->overrides, checker_name, "(overrides setting)");
- do_set(checker_name, pp->hwe, checker_name, "(controller setting)");
- do_set(checker_name, conf, checker_name, "(config file setting)");
+ do_set(checker_name, conf->overrides, checker_name, "(setting: multipath.conf overrides section)");
+ do_set(checker_name, pp->hwe, checker_name, "(setting: array configuration)");
+ do_set(checker_name, conf, checker_name, "(setting: multipath.conf defaults/devices section)");
do_default(checker_name, DEFAULT_CHECKER);
out:
checker_get(conf->multipath_dir, c, checker_name);
condlog(3, "%s: path_checker = %s %s", pp->dev, c->name, origin);
if (conf->checker_timeout) {
c->timeout = conf->checker_timeout;
- condlog(3, "%s: checker timeout = %u s (config file default)",
+ condlog(3, "%s: checker timeout = %u s (setting: multipath.conf defaults/devices section)",
pp->dev, c->timeout);
}
else if (sysfs_get_timeout(pp, &c->timeout) > 0)
- condlog(3, "%s: checker timeout = %u ms (sysfs setting)",
+ condlog(3, "%s: checker timeout = %u ms (setting: kernel sysfs)",
pp->dev, c->timeout);
else {
c->timeout = DEF_TIMEOUT;
- condlog(3, "%s: checker timeout = %u ms (internal default)",
+ condlog(3, "%s: checker timeout = %u ms (setting: multipath internal)",
pp->dev, c->timeout);
}
return 0;
@@ -397,17 +397,17 @@ int select_prio(struct config *conf, struct path *pp)
if (pp->detect_prio == DETECT_PRIO_ON) {
detect_prio(conf, pp);
if (prio_selected(p)) {
- origin = "(detected setting)";
+ origin = "(setting: array autodetected)";
goto out;
}
}
mpe = find_mpe(conf->mptable, pp->wwid);
- set_prio(conf->multipath_dir, mpe, "(LUN setting)");
- set_prio(conf->multipath_dir, conf->overrides, "(overrides setting)");
- set_prio(conf->multipath_dir, pp->hwe, "controller setting)");
- set_prio(conf->multipath_dir, conf, "(config file default)");
+ set_prio(conf->multipath_dir, mpe, "(setting: multipath.conf multipaths section)");
+ set_prio(conf->multipath_dir, conf->overrides, "(setting: multipath.conf overrides section)");
+ set_prio(conf->multipath_dir, pp->hwe, "(setting: array configuration)");
+ set_prio(conf->multipath_dir, conf, "(setting: multipath.conf defaults/devices section)");
prio_get(conf->multipath_dir, p, DEFAULT_PRIO, DEFAULT_PRIO_ARGS);
- origin = "(internal default)";
+ origin = "(setting: multipath internal)";
out:
/*
* fetch tpgs mode for alua, if its not already obtained
@@ -448,7 +448,7 @@ out:
condlog(3, "%s: no_path_retry = %s (inherited setting)",
mp->alias, buff);
else
- condlog(3, "%s: no_path_retry = undef (internal default)",
+ condlog(3, "%s: no_path_retry = undef (setting: multipath internal)",
mp->alias);
return 0;
}
@@ -458,10 +458,10 @@ select_minio_rq (struct config *conf, struct multipath * mp)
{
char *origin;
- do_set(minio_rq, mp->mpe, mp->minio, "(LUN setting)");
- do_set(minio_rq, conf->overrides, mp->minio, "(overrides setting)");
- do_set(minio_rq, mp->hwe, mp->minio, "(controller setting)");
- do_set(minio_rq, conf, mp->minio, "(config file setting)");
+ do_set(minio_rq, mp->mpe, mp->minio, "(setting: multipath.conf multipaths section)");
+ do_set(minio_rq, conf->overrides, mp->minio, "(setting: multipath.conf overrides section)");
+ do_set(minio_rq, mp->hwe, mp->minio, "(setting: array configuration)");
+ do_set(minio_rq, conf, mp->minio, "(setting: multipath.conf defaults/devices section)");
do_default(mp->minio, DEFAULT_MINIO_RQ);
out:
condlog(3, "%s: minio = %i %s", mp->alias, mp->minio, origin);
--
2.10.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2017-08-20 0:47 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-18 0:07 [PATCH] multipath-tools: Replace multipath configuration output Xose Vazquez Perez
2017-05-18 0:06 ` Xose Vazquez Perez
2017-06-21 10:33 ` Christophe Varoqui
-- strict thread matches above, loose matches on Subject: below --
2017-04-08 13:30 [PATCH] multipath-tools: replace " Xose Vazquez Perez
2017-04-12 7:35 ` Christophe Varoqui
2017-04-13 23:56 ` Xose Vazquez Perez
2017-04-14 8:29 ` Christophe Varoqui
2016-11-24 22:44 Xose Vazquez Perez
2016-11-25 9:00 ` Martin Wilck
2016-11-26 9:21 ` Christophe Varoqui
2016-12-02 3:52 ` Benjamin Marzinski
2016-12-07 22:48 ` Xose Vazquez Perez
2016-12-14 18:29 ` Christophe Varoqui
2016-12-07 15:44 ` Xose Vazquez Perez
2016-12-07 16:17 ` Martin Wilck
[not found] ` <c78854cd-f7f2-77ef-2d19-a5ff236e9a37@gmail.com>
2017-08-20 0:47 ` Xose Vazquez Perez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.