Re: [PATCH v2] multipath: display the correct configuration when dumpping config

[Martin Wilck]

On Mon, 2024-06-24 at 09:45 +0800, 303146...@qq.com wrote:
> From: Kou Wenqi <kouwe...@kylinos.cn>
> 
> "multipath -t" and "multipath -T" might show the wrong
> multipathd configuration items "retrigger_tries" and
> "force_sync". Make sure they don't.
> 
> Signed-off-by: Kou Wenqi <kouwe...@kylinos.cn>
> ---
>  multipath/main.c | 8 ++++++++
>  1 file changed, 8 insertions(+)

Thanks for the patch! I'd prefer the following, if you agree.

diff --git a/multipath/main.c b/multipath/main.c
index 4b19d2e..28e3a05 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -853,8 +853,6 @@ main (int argc, char *argv[])
        if (atexit(uninit_config))
                condlog(1, "failed to register cleanup handler for config: %m");
        conf = get_multipath_config();
-       conf->retrigger_tries = 0;
-       conf->force_sync = 1;
        if (atexit(cleanup_vecs))
                condlog(1, "failed to register cleanup handler for vecs: %m");
        if (atexit(cleanup_bindings))
@@ -1001,6 +999,11 @@ main (int argc, char *argv[])
 
        libmp_udev_set_sync_support(1);
 
+       if (cmd != CMD_DUMP_CONFIG) {
+               conf->retrigger_tries = 0;
+               conf->force_sync = 1;
+       }
+
        if ((cmd == CMD_LIST_SHORT || cmd == CMD_LIST_LONG) && enable_foreign)
                conf->enable_foreign = strdup("");