packages/multipath-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!215 [sync] PR-212: sync patch multipath-display-the-correct-configuration-when-dum.patch with community

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504
This commit is contained in:
openeuler-ci-bot 2024-08-31 01:44:20 +00:00 committed by Gitee
commit 7acb4f6262
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
0022-multipath-display-the-correct-configuration-when-dum.patch
View File

@ -1,54 +1,44 @@
From 1c254fdc42fe238fd475f724a948d22d1951791e Mon Sep 17 00:00:00 2001 From 0802e9dfd27e2333615e8068d7fa55a614bef92e Mon Sep 17 00:00:00 2001
From: Kou Wenqi <kouwenqi@kylinos.cn> From: Kou Wenqi <kouwenqi@kylinos.cn>
Date: Mon, 24 Jun 2024 13:40:30 +0800 Date: Tue, 13 Aug 2024 10:12:36 +0800
Subject: [PATCH] multipath: display the correct configuration when dumpping Subject: [PATCH] multipath: display the correct configuration when dumping
config config
"multipath -t" and "multipath -T" might show the wrong "multipath -t" and "multipath -T" might show the wrong
multipathd configuration items "retrigger_tries" and multipathd configuration items "retrigger_tries" and
"force_sync". Make sure they don't. "force_sync". Make sure they don't.
Signed-off-by: Kou Wenqi <kouwenqi@kylinos.cn>
Reviewed-by: Martin Wilck <mwilck@suse.com>
--- ---
multipath/main.c | 8 ++++++++ multipath/main.c | 7 +++++--
1 file changed, 8 insertions(+) 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/multipath/main.c b/multipath/main.c diff --git a/multipath/main.c b/multipath/main.c
index 90f940f..1ab313d 100644 index 90f940f..69acd06 100644
--- a/multipath/main.c --- a/multipath/main.c
+++ b/multipath/main.c +++ b/multipath/main.c
@@ -828,6 +828,8 @@ main (int argc, char *argv[]) @@ -838,8 +838,6 @@ main (int argc, char *argv[])
struct config *conf;
int retries = -1;
bool enable_foreign = false;
+ int retrigger_tries_ori;
+ int force_sync_ori;
libmultipath_init();
if (atexit(dm_lib_exit) || atexit(libmultipath_exit))
@@ -838,7 +840,9 @@ main (int argc, char *argv[])
if (atexit(uninit_config)) if (atexit(uninit_config))
condlog(1, "failed to register cleanup handler for config: %m"); condlog(1, "failed to register cleanup handler for config: %m");
conf = get_multipath_config(); conf = get_multipath_config();
+ retrigger_tries_ori = conf->retrigger_tries; - conf->retrigger_tries = 0;
conf->retrigger_tries = 0; - conf->force_sync = 1;
+ force_sync_ori = conf->force_sync;
conf->force_sync = 1;
if (atexit(cleanup_vecs)) if (atexit(cleanup_vecs))
condlog(1, "failed to register cleanup handler for vecs: %m"); condlog(1, "failed to register cleanup handler for vecs: %m");
@@ -908,10 +912,14 @@ main (int argc, char *argv[]) while ((arg = getopt(argc, argv, ":adDcChl::eFfM:v:p:b:BrR:itTquUwW")) != EOF ) {
conf->find_multipaths = FIND_MULTIPATHS_GREEDY; @@ -984,6 +982,11 @@ main (int argc, char *argv[])
break;
case 't': libmp_udev_set_sync_support(1);
+ conf->retrigger_tries = retrigger_tries_ori;
+ conf->force_sync = force_sync_ori; + if (cmd != CMD_DUMP_CONFIG) {
r = dump_config(conf, NULL, NULL) ? RTVL_FAIL : RTVL_OK; + conf->retrigger_tries = 0;
goto out; + conf->force_sync = 1;
case 'T': + }
cmd = CMD_DUMP_CONFIG; +
+ conf->retrigger_tries = retrigger_tries_ori; if ((cmd == CMD_LIST_SHORT || cmd == CMD_LIST_LONG) && enable_foreign)
+ conf->force_sync = force_sync_ori; conf->enable_foreign = strdup("");
break;
case 'h':
usage(argv[0]);
-- --
2.27.0 2.27.0

5
multipath-tools.spec
View File

@ -1,7 +1,7 @@
#needsrootforbuild #needsrootforbuild
Name: multipath-tools Name: multipath-tools
Version: 0.9.5 Version: 0.9.5
Release: 6 Release: 7
Summary: Tools to manage multipath devices with the device-mapper Summary: Tools to manage multipath devices with the device-mapper
License: GPL-2.0-or-later and LGPL-2.0-only License: GPL-2.0-or-later and LGPL-2.0-only
URL: http://christophe.varoqui.free.fr/ URL: http://christophe.varoqui.free.fr/
@ -185,6 +185,9 @@ fi
%changelog %changelog
* Tue Aug 27 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.9.5-7
- sync patch22 with community
* Tue Aug 20 2024 Jiaming Zhang <zhangjiaming@cqsoftware.com.cn> - 0.9.5-6 * Tue Aug 20 2024 Jiaming Zhang <zhangjiaming@cqsoftware.com.cn> - 0.9.5-6
- Added 'Buildarch:noarch' to the help subpackage - Added 'Buildarch:noarch' to the help subpackage