c9012ec5b7
Modify 0004-RH-Remove-the-property-blacklist-exception-builtin.patch
* update multipath.conf.5 man page to remove builtin listing
Modify 0005-RH-don-t-start-without-a-config-file.patch
* update multipathd.8 man page to note that a config file is necessary
Modify 0007-RH-add-mpathconf.patch
* add property blacklist-exception to default config file
Add 0010-libmultipath-change-how-RADOS-checker-is-enabled.patch
* Makefile now autodetects librados. Posted upstream
Remove related RADOS option from spec file
Add 0011-multipath-set-verbosity-to-default-during-config.patch
* Allow multipath to print warning messages during configuration.
Posted upstream
Add 0012-mpath-skip-device-configs-without-vendor-product.patch
* device entries without vendor/product were breaking configurations.
Posted upsteam
Add 0013-multipathd-fix-show-maps-json-crash.patch
* multipathd crashed showing json output with no devices. Posted
upstream
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Wed, 31 May 2017 15:03:02 -0500
|
|
Subject: [PATCH] multipath: set verbosity to default during config
|
|
|
|
condlog was setting the verbosity to 0 if there was no configuration.
|
|
This keeps multipath from printing warning messages about config file
|
|
problems that are found while loading the configuration. Instead, it
|
|
should use the default config level until it loads the configuration
|
|
to find the current value.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/debug.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/debug.c b/libmultipath/debug.c
|
|
index fbe171a..f89b264 100644
|
|
--- a/libmultipath/debug.c
|
|
+++ b/libmultipath/debug.c
|
|
@@ -11,6 +11,7 @@
|
|
#include "../third-party/valgrind/drd.h"
|
|
#include "vector.h"
|
|
#include "config.h"
|
|
+#include "defaults.h"
|
|
|
|
void dlog (int sink, int prio, const char * fmt, ...)
|
|
{
|
|
@@ -21,7 +22,7 @@ void dlog (int sink, int prio, const char * fmt, ...)
|
|
va_start(ap, fmt);
|
|
conf = get_multipath_config();
|
|
ANNOTATE_IGNORE_READS_BEGIN();
|
|
- thres = (conf) ? conf->verbosity : 0;
|
|
+ thres = (conf) ? conf->verbosity : DEFAULT_VERBOSITY;
|
|
ANNOTATE_IGNORE_READS_END();
|
|
put_multipath_config(conf);
|
|
|
|
--
|
|
2.7.4
|
|
|