From d03a21a3474993cdf95c73da7ea70308659c3d70 Mon Sep 17 00:00:00 2001 From: Kou Wenqi Date: Mon, 5 Aug 2024 14:35:06 +0800 Subject: [PATCH] multipath: display the correct configuration when dumpping config "multipath -t" and "multipath -T" might show the wrong multipathd configuration items "retrigger_tries" and "force_sync". Make sure they don't. --- multipath/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/multipath/main.c b/multipath/main.c index 3c5a70e..f52430f 100644 --- a/multipath/main.c +++ b/multipath/main.c @@ -866,6 +866,8 @@ main (int argc, char *argv[]) char *dev = NULL; struct config *conf; int retries = -1; + int retrigger_tries_ori; + int force_sync_ori; udev = udev_new(); logsink = 0; @@ -873,7 +875,9 @@ main (int argc, char *argv[]) if (!conf) exit(RTVL_FAIL); multipath_conf = conf; + retrigger_tries_ori = conf->retrigger_tries; conf->retrigger_tries = 0; + force_sync_ori = conf->force_sync; conf->force_sync = 1; while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { switch(arg) { @@ -944,10 +948,14 @@ main (int argc, char *argv[]) conf->find_multipaths = FIND_MULTIPATHS_GREEDY; break; case 't': + conf->retrigger_tries = retrigger_tries_ori; + conf->force_sync = force_sync_ori; r = dump_config(conf, NULL, NULL) ? RTVL_FAIL : RTVL_OK; goto out_free_config; case 'T': cmd = CMD_DUMP_CONFIG; + conf->retrigger_tries = retrigger_tries_ori; + conf->force_sync = force_sync_ori; break; case 'h': usage(argv[0]); -- 2.27.0