From: "Benjamin Marzinski" <bmarzins@redhat.com>
To: Martin Wilck <mwilck@suse.com>
Cc: dm-devel@redhat.com
Subject: Re: [PATCH v5 11/21] multipathd: improve checker message logging
Date: Fri, 2 Nov 2018 11:54:20 -0500 [thread overview]
Message-ID: <20181102165420.GF29522@octiron.msp.redhat.com> (raw)
In-Reply-To: <20181102122125.30906-12-mwilck@suse.com>
On Fri, Nov 02, 2018 at 01:21:15PM +0100, Martin Wilck wrote:
> Don't rely on any variables being defined in LOG_MSG.
> If message log level is low, don't bother to fetch the message.
>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
> multipathd/main.c | 35 ++++++++++++++++++++++++-----------
> 1 file changed, 24 insertions(+), 11 deletions(-)
>
> diff --git a/multipathd/main.c b/multipathd/main.c
> index bf5f12a6..2f922db7 100644
> --- a/multipathd/main.c
> +++ b/multipathd/main.c
> @@ -89,12 +89,24 @@ static int use_watchdog;
> #define FILE_NAME_SIZE 256
> #define CMDSIZE 160
>
> -#define LOG_MSG(a, b) \
> -do { \
> - if (pp->offline) \
> - condlog(a, "%s: %s - path offline", pp->mpp->alias, pp->dev); \
> - else if (strlen(b)) \
> - condlog(a, "%s: %s - %s", pp->mpp->alias, pp->dev, b); \
> +#define LOG_MSG(lvl, verb, pp) \
> +do { \
> + if (lvl <= verb) { \
> + if (pp->offline) \
> + condlog(lvl, "%s: %s - path offline", \
> + pp->mpp->alias, pp->dev); \
> + else { \
> + const char *__m = \
> + checker_message(&pp->checker); \
> + \
> + if (strlen(__m)) \
> + condlog(lvl, "%s: %s - %s checker%s", \
> + pp->mpp->alias, \
> + pp->dev, \
> + checker_name(&pp->checker), \
> + __m); \
> + } \
> + } \
> } while(0)
>
> struct mpath_event_param
> @@ -1811,7 +1823,7 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
> int add_active;
> int disable_reinstate = 0;
> int oldchkrstate = pp->chkrstate;
> - int retrigger_tries, checkint, max_checkint;
> + int retrigger_tries, checkint, max_checkint, verbosity;
> struct config *conf;
> int ret;
>
> @@ -1828,6 +1840,7 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
> retrigger_tries = conf->retrigger_tries;
> checkint = conf->checkint;
> max_checkint = conf->max_checkint;
> + verbosity = conf->verbosity;
> put_multipath_config(conf);
> if (!pp->mpp && pp->initialized == INIT_MISSING_UDEV) {
> if (pp->retriggers < retrigger_tries) {
> @@ -1970,7 +1983,7 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
> int oldstate = pp->state;
> pp->state = newstate;
>
> - LOG_MSG(1, checker_message(&pp->checker));
> + LOG_MSG(1, verbosity, pp);
>
> /*
> * upon state change, reset the checkint
> @@ -2058,7 +2071,7 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
> return 0;
> }
> } else {
> - LOG_MSG(4, checker_message(&pp->checker));
> + LOG_MSG(4, verbosity, pp);
> if (pp->checkint != max_checkint) {
> /*
> * double the next check delay.
> @@ -2088,9 +2101,9 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
> log_checker_err = conf->log_checker_err;
> put_multipath_config(conf);
> if (log_checker_err == LOG_CHKR_ERR_ONCE)
> - LOG_MSG(3, checker_message(&pp->checker));
> + LOG_MSG(3, verbosity, pp);
> else
> - LOG_MSG(2, checker_message(&pp->checker));
> + LOG_MSG(2, verbosity, pp);
> }
> }
>
> --
> 2.19.1
next prev parent reply other threads:[~2018-11-02 16:54 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 12:21 [PATCH v5 00/21] libmultipath: checkers overhaul Martin Wilck
2018-11-02 12:21 ` [PATCH v5 01/21] libmultipath: fix use of uninitialized memory in write() Martin Wilck
2018-11-02 12:21 ` [PATCH v5 02/21] libmultipath: fix memory leaks from scandir() use Martin Wilck
2018-11-02 12:21 ` [PATCH v5 03/21] libmultipath/checkers: replace message by msgid Martin Wilck
2018-11-02 16:05 ` Benjamin Marzinski
2018-11-02 12:21 ` [PATCH v5 04/21] libmultipath/checkers: cciss_tur: use message id Martin Wilck
2018-11-02 12:21 ` [PATCH v5 05/21] libmultipath/checkers: directio: " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 06/21] libmultipath/checkers: emc_clariion: " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 07/21] libmultipath/checkers: hp_sw: " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 08/21] libmultipath/checkers: rdac: " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 09/21] libmultipath/checkers: readsector0: " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 10/21] libmultipath/checkers: tur: " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 11/21] multipathd: improve checker message logging Martin Wilck
2018-11-02 16:54 ` Benjamin Marzinski [this message]
2018-11-02 12:21 ` [PATCH v5 12/21] libmultipath/checkers: support unsupported paths Martin Wilck
2018-11-02 12:21 ` [PATCH v5 13/21] libmultipath: clariion checker: leave unsupported paths alone Martin Wilck
2018-11-02 12:21 ` [PATCH v5 14/21] libmultipath: hp_sw " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 15/21] libmultipath: rdac " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 16/21] libmultipath: tur " Martin Wilck
2018-11-02 12:21 ` [PATCH v5 17/21] libmultipath: pathinfo: don't blank wwid if checker fails Martin Wilck
2018-11-02 12:21 ` [PATCH v5 18/21] multipathd: check_path: improve logging for "unusable path" case Martin Wilck
2018-11-02 12:21 ` [PATCH v5 19/21] libmultipath: coalesce_paths: improve logging of orphaned paths Martin Wilck
2018-11-02 12:21 ` [PATCH v5 20/21] libmultipath: sync_map_state: log failing paths Martin Wilck
2018-11-02 12:21 ` [PATCH v5 21/21] libmultipath/checkers: cleanup class/instance model Martin Wilck
2018-11-14 7:39 ` [PATCH v5 00/21] libmultipath: checkers overhaul Christophe Varoqui
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=20181102165420.GF29522@octiron.msp.redhat.com \
--to=bmarzins@redhat.com \
--cc=dm-devel@redhat.com \
--cc=mwilck@suse.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