On Fri, Oct 16, 2020 at 12:44:56PM +0200, mwilck@xxxxxxxx wrote:
> From: Martin Wilck <mwilck@xxxxxxxx>
>
> Introduce a new global variable to set the verbosity of libmultipath.
> This avoids accessing the configuration in every dlog() call.
> When libmultipath reads its configuration in init_config() or
> load_config(), it will use the current value of libmp_verbosity
> for logging. Immediately before returning, libmp_verbosity will be
> overwritten with the verbosity value from the configuration file,
> if it was set there. An application is free to set libmp_verbosity
> back to the previous value or not after that, depending on whether
> command line options or configuration file settings should take
> precedence.
Is there some reason why domap() and coalesce_paths() call
print_multipath_topology() and libmp_dm_init() calls dm_init() using
conf->verbosity instead of libmp_verbosity?
-Ben
>
> Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
> ---
> libmpathpersist/mpath_persist.c | 5 +---
> libmultipath/config.c | 9 +++++--
> libmultipath/debug.c | 10 ++------
> libmultipath/debug.h | 1 +
> libmultipath/libmultipath.version | 5 ++++
> multipath/main.c | 21 ++++++----------
> multipathd/main.c | 40 ++++++++++++++++++-------------
> tests/alias.c | 1 +
> tests/blacklist.c | 2 ++
> 9 files changed, 49 insertions(+), 45 deletions(-)
>
> diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
> index 9ebf91d..79322e8 100644
> --- a/libmpathpersist/mpath_persist.c
> +++ b/libmpathpersist/mpath_persist.c
> @@ -170,10 +170,7 @@ void mpath_persistent_reserve_free_vecs(void)
>
> int mpath_persistent_reserve_init_vecs(int verbose)
> {
> - struct config *conf = get_multipath_config();
> -
> - conf->verbosity = verbose;
> - put_multipath_config(conf);
> + libmp_verbosity = verbose;
>
> if (curmp)
> return MPATH_PR_SUCCESS;
> diff --git a/libmultipath/config.c b/libmultipath/config.c
> index 52b1447..49e7fb8 100644
> --- a/libmultipath/config.c
> +++ b/libmultipath/config.c
> @@ -828,10 +828,14 @@ int _init_config (const char *file, struct config *conf)
> conf = &__internal_config;
>
> /*
> - * internal defaults
> + * Processing the config file will overwrite conf->verbosity if set
> + * When we return, we'll copy the config value back
> */
> - conf->verbosity = DEFAULT_VERBOSITY;
> + conf->verbosity = libmp_verbosity;
>
> + /*
> + * internal defaults
> + */
> get_sys_max_fds(&conf->max_fds);
> conf->bindings_file = set_default(DEFAULT_BINDINGS_FILE);
> conf->wwids_file = set_default(DEFAULT_WWIDS_FILE);
> @@ -997,6 +1001,7 @@ int _init_config (const char *file, struct config *conf)
> !conf->wwids_file || !conf->prkeys_file)
> goto out;
>
> + libmp_verbosity = conf->verbosity;
> return 0;
> out:
> _uninit_config(conf);
> diff --git a/libmultipath/debug.c b/libmultipath/debug.c
> index b3a1de9..a1713b9 100644
> --- a/libmultipath/debug.c
> +++ b/libmultipath/debug.c
> @@ -16,21 +16,15 @@
> #include "debug.h"
>
> int logsink;
> +int libmp_verbosity = DEFAULT_VERBOSITY;
>
> void dlog (int sink, int prio, const char * fmt, ...)
> {
> va_list ap;
> - int thres;
> - struct config *conf;
>
> va_start(ap, fmt);
> - conf = get_multipath_config();
> - ANNOTATE_IGNORE_READS_BEGIN();
> - thres = (conf) ? conf->verbosity : DEFAULT_VERBOSITY;
> - ANNOTATE_IGNORE_READS_END();
> - put_multipath_config(conf);
>
> - if (prio <= thres) {
> + if (prio <= libmp_verbosity) {
> if (sink < 1) {
> if (sink == 0) {
> time_t t = time(NULL);
> diff --git a/libmultipath/debug.h b/libmultipath/debug.h
> index c6120c1..1f3bc8b 100644
> --- a/libmultipath/debug.h
> +++ b/libmultipath/debug.h
> @@ -8,6 +8,7 @@ void dlog (int sink, int prio, const char * fmt, ...)
> #include "log_pthread.h"
>
> extern int logsink;
> +extern int libmp_verbosity;
>
> #define condlog(prio, fmt, args...) \
> dlog(logsink, prio, fmt "\n", ##args)
> diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version
> index 800cff2..67a7379 100644
> --- a/libmultipath/libmultipath.version
> +++ b/libmultipath/libmultipath.version
> @@ -259,3 +259,8 @@ global:
> local:
> *;
> };
> +
> +LIBMULTIPATH_4.1.0 {
> +global:
> + libmp_verbosity;
> +} LIBMULTIPATH_4.0.0;
> diff --git a/multipath/main.c b/multipath/main.c
> index 9974993..9bdc5d2 100644
> --- a/multipath/main.c
> +++ b/multipath/main.c
> @@ -208,22 +208,15 @@ get_dm_mpvec (enum mpath_cmds cmd, vector curmp, vector pathvec, char * refwwid)
> mpp->bestpg = select_path_group(mpp);
>
> if (cmd == CMD_LIST_SHORT ||
> - cmd == CMD_LIST_LONG) {
> - struct config *conf = get_multipath_config();
> - print_multipath_topology(mpp, conf->verbosity);
> - put_multipath_config(conf);
> - }
> + cmd == CMD_LIST_LONG)
> + print_multipath_topology(mpp, libmp_verbosity);
>
> if (cmd == CMD_CREATE)
> reinstate_paths(mpp);
> }
>
> - if (cmd == CMD_LIST_SHORT || cmd == CMD_LIST_LONG) {
> - struct config *conf = get_multipath_config();
> -
> - print_foreign_topology(conf->verbosity);
> - put_multipath_config(conf);
> - }
> + if (cmd == CMD_LIST_SHORT || cmd == CMD_LIST_LONG)
> + print_foreign_topology(libmp_verbosity);
>
> return 0;
> }
> @@ -554,7 +547,7 @@ configure (struct config *conf, enum mpath_cmds cmd,
> if (path_discovery(pathvec, di_flag) < 0)
> goto out;
>
> - if (conf->verbosity > 2)
> + if (libmp_verbosity > 2)
> print_all_paths(pathvec, 1);
>
> get_path_layout(pathvec, 0);
> @@ -866,7 +859,7 @@ main (int argc, char *argv[])
> exit(RTVL_FAIL);
> }
>
> - conf->verbosity = atoi(optarg);
> + libmp_verbosity = atoi(optarg);
> break;
> case 'b':
> conf->bindings_file = strdup(optarg);
> @@ -997,7 +990,7 @@ main (int argc, char *argv[])
> }
> if (dev_type == DEV_UEVENT) {
> openlog("multipath", 0, LOG_DAEMON);
> - setlogmask(LOG_UPTO(conf->verbosity + 3));
> + setlogmask(LOG_UPTO(libmp_verbosity + 3));
> logsink = 1;
> }
>
> diff --git a/multipathd/main.c b/multipathd/main.c
> index 33277d5..fbd354c 100644
> --- a/multipathd/main.c
> +++ b/multipathd/main.c
> @@ -88,10 +88,10 @@
> #define CMDSIZE 160
> #define MSG_SIZE 32
>
> -#define LOG_MSG(lvl, verb, pp) \
> +#define LOG_MSG(lvl, pp) \
> do { \
> if (pp->mpp && checker_selected(&pp->checker) && \
> - lvl <= verb) { \
> + lvl <= libmp_verbosity) { \
> if (pp->offline) \
> condlog(lvl, "%s: %s - path offline", \
> pp->mpp->alias, pp->dev); \
> @@ -2070,7 +2070,7 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
> int chkr_new_path_up = 0;
> int disable_reinstate = 0;
> int oldchkrstate = pp->chkrstate;
> - int retrigger_tries, verbosity;
> + int retrigger_tries;
> unsigned int checkint, max_checkint;
> struct config *conf;
> int marginal_pathgroups, marginal_changed = 0;
> @@ -2090,7 +2090,6 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
> retrigger_tries = conf->retrigger_tries;
> checkint = conf->checkint;
> max_checkint = conf->max_checkint;
> - verbosity = conf->verbosity;
> marginal_pathgroups = conf->marginal_pathgroups;
> put_multipath_config(conf);
>
> @@ -2152,7 +2151,7 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
> if (newstate == PATH_WILD || newstate == PATH_UNCHECKED) {
> condlog(2, "%s: unusable path (%s) - checker failed",
> pp->dev, checker_state_name(newstate));
> - LOG_MSG(2, verbosity, pp);
> + LOG_MSG(2, pp);
> conf = get_multipath_config();
> pthread_cleanup_push(put_multipath_config, conf);
> pathinfo(pp, conf, 0);
> @@ -2257,7 +2256,7 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
> int oldstate = pp->state;
> pp->state = newstate;
>
> - LOG_MSG(1, verbosity, pp);
> + LOG_MSG(1, pp);
>
> /*
> * upon state change, reset the checkint
> @@ -2321,7 +2320,7 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
> /* Clear IO errors */
> reinstate_path(pp);
> else {
> - LOG_MSG(4, verbosity, pp);
> + LOG_MSG(4, pp);
> if (pp->checkint != max_checkint) {
> /*
> * double the next check delay.
> @@ -2349,9 +2348,9 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
> log_checker_err = conf->log_checker_err;
> put_multipath_config(conf);
> if (log_checker_err == LOG_CHKR_ERR_ONCE)
> - LOG_MSG(3, verbosity, pp);
> + LOG_MSG(3, pp);
> else
> - LOG_MSG(2, verbosity, pp);
> + LOG_MSG(2, pp);
> }
> }
>
> @@ -2696,6 +2695,10 @@ reconfigure (struct vectors * vecs)
> if (!conf)
> return 1;
>
> + if (verbosity)
> + libmp_verbosity = verbosity;
> + setlogmask(LOG_UPTO(libmp_verbosity + 3));
> +
> /*
> * free old map and path vectors ... they use old conf state
> */
> @@ -2710,8 +2713,6 @@ reconfigure (struct vectors * vecs)
> /* Re-read any timezone changes */
> tzset();
>
> - if (verbosity)
> - conf->verbosity = verbosity;
> if (bindings_read_only)
> conf->bindings_read_only = bindings_read_only;
> check_alias_settings(conf);
> @@ -3093,14 +3094,18 @@ child (__attribute__((unused)) void *param)
> condlog(2, "--------start up--------");
> condlog(2, "read " DEFAULT_CONFIGFILE);
>
> + if (verbosity)
> + libmp_verbosity = verbosity;
> conf = load_config(DEFAULT_CONFIGFILE);
> + if (verbosity)
> + libmp_verbosity = verbosity;
> + setlogmask(LOG_UPTO(libmp_verbosity + 3));
> +
> if (!conf) {
> condlog(0, "failed to load configuration");
> goto failed;
> }
>
> - if (verbosity)
> - conf->verbosity = verbosity;
> if (bindings_read_only)
> conf->bindings_read_only = bindings_read_only;
> uxsock_timeout = conf->uxsock_timeout;
> @@ -3119,7 +3124,6 @@ child (__attribute__((unused)) void *param)
>
> if (poll_dmevents)
> poll_dmevents = dmevent_poll_supported();
> - setlogmask(LOG_UPTO(conf->verbosity + 3));
>
> envp = getenv("LimitNOFILE");
>
> @@ -3341,7 +3345,7 @@ main (int argc, char *argv[])
> !isdigit(optarg[0]))
> exit(1);
>
> - verbosity = atoi(optarg);
> + libmp_verbosity = verbosity = atoi(optarg);
> break;
> case 's':
> logsink = -1;
> @@ -3352,7 +3356,7 @@ main (int argc, char *argv[])
> if (!conf)
> exit(1);
> if (verbosity)
> - conf->verbosity = verbosity;
> + libmp_verbosity = verbosity;
> uxsock_timeout = conf->uxsock_timeout;
> err = uxclnt(optarg, uxsock_timeout + 100);
> free_config(conf);
> @@ -3378,11 +3382,13 @@ main (int argc, char *argv[])
> char * c = s;
>
> logsink = 0;
> + if (verbosity)
> + libmp_verbosity = verbosity;
> conf = load_config(DEFAULT_CONFIGFILE);
> if (!conf)
> exit(1);
> if (verbosity)
> - conf->verbosity = verbosity;
> + libmp_verbosity = verbosity;
> uxsock_timeout = conf->uxsock_timeout;
> memset(cmd, 0x0, CMDSIZE);
> while (optind < argc) {
> diff --git a/tests/alias.c b/tests/alias.c
> index 5624138..e5e20b2 100644
> --- a/tests/alias.c
> +++ b/tests/alias.c
> @@ -735,6 +735,7 @@ static int test_allocate_binding(void)
> int main(void)
> {
> int ret = 0;
> + libmp_verbosity = conf.verbosity;
>
> ret += test_format_devname();
> ret += test_scan_devname();
> diff --git a/tests/blacklist.c b/tests/blacklist.c
> index 84a3ba2..0b42e25 100644
> --- a/tests/blacklist.c
> +++ b/tests/blacklist.c
> @@ -22,6 +22,7 @@
> #include "globals.c"
> #include "blacklist.h"
> #include "test-log.h"
> +#include "debug.h"
>
> struct udev_device {
> const char *sysname;
> @@ -152,6 +153,7 @@ static int setup(void **state)
> store_ble(blist_property_wwn_inv, "!ID_WWN", ORIGIN_CONFIG))
> return -1;
>
> + libmp_verbosity = conf.verbosity = 4;
> return 0;
> }
>
> --
> 2.28.0
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
