From: Benjamin Marzinski <bmarzins@redhat.com>
To: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>,
Martin Wilck <Martin.Wilck@suse.com>
Subject: [dm-devel] [PATCH 4/4] multipathd: add "reconfigure all" command.
Date: Mon, 20 Sep 2021 18:21:16 -0500 [thread overview]
Message-ID: <1632180076-9294-5-git-send-email-bmarzins@redhat.com> (raw)
In-Reply-To: <1632180076-9294-1-git-send-email-bmarzins@redhat.com>
With this commit, multipathd no longer defaults to full reconfigures for
the "reconfigure" command and the HUP signal. The default is a weak
reconfigure. A new command, "reconfigure all", has been added to do
a full reconfigure.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
---
multipath/main.c | 2 +-
multipathd/cli.c | 1 +
multipathd/cli.h | 2 ++
multipathd/cli_handlers.c | 10 ++++++++++
multipathd/main.c | 2 +-
5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/multipath/main.c b/multipath/main.c
index 65ece830..7b9797ec 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -759,7 +759,7 @@ int delegate_to_multipathd(enum mpath_cmds cmd,
return NOT_DELEGATED;
if (cmd == CMD_CREATE && conf->force_reload == FORCE_RELOAD_YES) {
- p += snprintf(p, n, "reconfigure");
+ p += snprintf(p, n, "reconfigure all");
}
else if (cmd == CMD_FLUSH_ONE && dev && dev_type == DEV_DEVMAP) {
p += snprintf(p, n, "del map %s", dev);
diff --git a/multipathd/cli.c b/multipathd/cli.c
index 414f6608..d9308bdf 100644
--- a/multipathd/cli.c
+++ b/multipathd/cli.c
@@ -212,6 +212,7 @@ load_keys (void)
r += add_key(keys, "local", LOCAL, 0);
r += add_key(keys, "setmarginal", SETMARGINAL, 0);
r += add_key(keys, "unsetmarginal", UNSETMARGINAL, 0);
+ r += add_key(keys, "all", ALL, 0);
if (r) {
diff --git a/multipathd/cli.h b/multipathd/cli.h
index fcb6af00..bba705e8 100644
--- a/multipathd/cli.h
+++ b/multipathd/cli.h
@@ -47,6 +47,7 @@ enum {
__LOCAL, /* 40 */
__SETMARGINAL,
__UNSETMARGINAL,
+ __ALL,
};
#define LIST (1ULL << __LIST)
@@ -93,6 +94,7 @@ enum {
#define LOCAL (1ULL << __LOCAL)
#define SETMARGINAL (1ULL << __SETMARGINAL)
#define UNSETMARGINAL (1ULL << __UNSETMARGINAL)
+#define ALL (1ULL << __ALL)
#define INITIAL_REPLY_LEN 1200
diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
index b12a4e7e..58b9916c 100644
--- a/multipathd/cli_handlers.c
+++ b/multipathd/cli_handlers.c
@@ -1012,6 +1012,15 @@ cli_reconfigure(void * v, struct strbuf *reply, void * data)
{
condlog(2, "reconfigure (operator)");
+ schedule_reconfigure(false);
+ return 0;
+}
+
+int
+cli_reconfigure_all(void * v, struct strbuf *reply, void * data)
+{
+ condlog(2, "reconfigure all (operator)");
+
schedule_reconfigure(true);
return 0;
}
@@ -1497,6 +1506,7 @@ void init_handler_callbacks(void)
set_handler_callback(DEL+MAPS, cli_del_maps);
set_handler_callback(SWITCH+MAP+GROUP, cli_switch_group);
set_unlocked_handler_callback(RECONFIGURE, cli_reconfigure);
+ set_unlocked_handler_callback(RECONFIGURE+ALL, cli_reconfigure_all);
set_handler_callback(SUSPEND+MAP, cli_suspend);
set_handler_callback(RESUME+MAP, cli_resume);
set_handler_callback(RESIZE+MAP, cli_resize);
diff --git a/multipathd/main.c b/multipathd/main.c
index 5c831e8d..cc4a4a5d 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -2817,7 +2817,7 @@ handle_signals(bool nonfatal)
return;
if (reconfig_sig) {
condlog(2, "reconfigure (signal)");
- schedule_reconfigure(true);
+ schedule_reconfigure(false);
}
if (log_reset_sig) {
condlog(2, "reset log (signal)");
--
2.17.2
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2021-09-20 23:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 23:21 [dm-devel] [PATCH 0/4] Add "reconfigure all" multipath command Benjamin Marzinski
2021-09-20 23:21 ` [dm-devel] [PATCH 1/4] multipathd: move delayed_reconfig out of struct config Benjamin Marzinski
2021-11-15 16:10 ` Martin Wilck
2021-11-15 16:27 ` Martin Wilck
2021-11-15 23:45 ` Benjamin Marzinski
2021-09-20 23:21 ` [dm-devel] [PATCH 2/4] multipathd: remove reconfigure from header file Benjamin Marzinski
2021-11-15 16:10 ` Martin Wilck
2021-09-20 23:21 ` [dm-devel] [PATCH 3/4] multipathd: pass in the type of reconfigure Benjamin Marzinski
2021-11-15 16:23 ` Martin Wilck
2021-11-15 23:46 ` Benjamin Marzinski
2021-09-20 23:21 ` Benjamin Marzinski [this message]
2021-11-15 16:30 ` [dm-devel] [PATCH 4/4] multipathd: add "reconfigure all" command Martin Wilck
2021-09-24 20:44 ` [dm-devel] [PATCH 0/4] Add "reconfigure all" multipath command Xose Vazquez Perez
2021-09-27 15:11 ` Benjamin Marzinski
2021-09-28 8:25 ` Martin Wilck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1632180076-9294-5-git-send-email-bmarzins@redhat.com \
--to=bmarzins@redhat.com \
--cc=Martin.Wilck@suse.com \
--cc=christophe.varoqui@opensvc.com \
--cc=dm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).