On Fri, Apr 20, 2018 at 05:56:37PM +0100, Daniel P. Berrangé wrote:

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virlog.c | 2 +- src/util/virlog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/virlog.c b/src/util/virlog.c index 5810643e1b..5262d613f6 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -87,7 +87,7 @@ VIR_ENUM_IMPL(virLogDestination, VIR_LOG_TO_OUTPUT_LAST, struct _virLogFilter { char *match; virLogPriority priority; - unsigned int flags; + unsigned int flags; /* bitwise OR of virLogFilterFlags */ };

static int virLogFiltersSerial = 1; diff --git a/src/util/virlog.h b/src/util/virlog.h index 8973f83b20..35dba16cfe 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -174,7 +174,7 @@ typedef void (*virLogCloseFunc) (void *data);

typedef enum { VIR_LOG_STACK_TRACE = (1 << 0), -} virLogFlags; +} virLogFilterFlags;

int virLogGetNbFilters(void); int virLogGetNbOutputs(void);

Reviewed-by: Erik Skultety <eskultet@redhat.com>

On Fri, Apr 20, 2018 at 05:56:38PM +0100, Daniel P. Berrangé wrote:

Rather than specialcasing handling of the '*' character, use fnmatch() to get normal shell wildcard syntax, as described in 'man glob(7)'.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virlog.c | 17 +++++++++++++++-- src/util/virlog.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/util/virlog.c b/src/util/virlog.c index 5262d613f6..1db10fcc71 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -40,6 +40,7 @@ #if HAVE_SYS_UN_H # include <sys/un.h> #endif +#include <fnmatch.h>

#include "virerror.h" #include "virlog.h" @@ -508,7 +509,9 @@ virLogSourceUpdate(virLogSourcePtr source) size_t i;

for (i = 0; i < virLogNbFilters; i++) { - if (strstr(source->name, virLogFilters[i]->match)) { + if ((virLogFilters[i]->flags & VIR_LOG_GLOB) ? + (fnmatch(virLogFilters[i]->match, source->name, 0) == 0) : + (strstr(source->name, virLogFilters[i]->match) != NULL)) {

After doing some perf tests I determined that while fnmatch is x14 slower than strstr, this is not worth the code complexity - always using fnmatch is invisible in real world perf tests. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

On Fri, Apr 20, 2018 at 05:56:39PM +0100, Daniel P. Berrangé wrote:

Strongly recommend against use of the log_levels setting since it creates overly verbose logs and has a serious performance impact.

Describe the log filter syntax better and mention use of shell glob syntax. Also provide more realistic example of good settings to use. The libvirtd example is biased towards QEMU, but when the drivers split off each daemon can get its own more appropriate example.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/locking/test_virtlockd.aug.in | 2 +- src/locking/virtlockd.conf | 70 +++++++++++++++++++++++++++---------- src/logging/test_virtlogd.aug.in | 2 +- src/logging/virtlogd.conf | 73 ++++++++++++++++++++++++++++----------- src/remote/libvirtd.conf | 70 +++++++++++++++++++++++-------------- src/remote/test_libvirtd.aug.in | 2 +- 6 files changed, 150 insertions(+), 69 deletions(-)

diff --git a/src/locking/test_virtlockd.aug.in b/src/locking/test_virtlockd.aug.in index ad75286be6..f2f6979ef5 100644 --- a/src/locking/test_virtlockd.aug.in +++ b/src/locking/test_virtlockd.aug.in @@ -3,7 +3,7 @@ module Test_virtlockd =

test Virtlockd.lns get conf = { "log_level" = "3" } - { "log_filters" = "3:remote 4:event" } + { "log_filters" = "1:locking 4:object 4:json 4:event 1:util" } { "log_outputs" = "3:syslog:virtlockd" } { "max_clients" = "1024" } { "admin_max_clients" = "5" } diff --git a/src/locking/virtlockd.conf b/src/locking/virtlockd.conf index 1a2b27d0b9..29cefbd74a 100644 --- a/src/locking/virtlockd.conf +++ b/src/locking/virtlockd.conf @@ -8,47 +8,79 @@

# Logging level: 4 errors, 3 warnings, 2 information, 1 debug # basically 1 will log everything possible +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. +# +# WARNING: It outputs too much information to practically read. +# WARNING: The "log_filters" setting is recommended instead. +# +# WARNING: Journald may employ rate limiting of the messages logged +# WARNING: and thus lock up the libvirt daemon. To use the debug +# WARNING: level with journald you have to specify it explicitly in +# WARNING: 'log_outputs', otherwise only information level messages

So is it really worth mentioning to use debug with journal, since there are only limitations? How about encouraging to use e.g. file for debug logs and journald for 3+.

+# WARNING: will be logged. +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. #log_level = 3

# Logging filters: # A filter allows to select a different logging level for a given category -# of logs -# The format for a filter is one of: -# x:name -# x:+name -# where name is a string which is matched against source file name, -# e.g., "remote", "qemu", or "util/json", the optional "+" prefix -# tells libvirt to log stack trace for each message matching name, -# and x is the minimal level where matching messages should be logged: +# of logs. The format for a filter is one of: +# +# level:match +# level:+match +# +# where 'match' is a string which is matched against the category +# given in the VIR_LOG_INIT() at the top of each libvirt source +# file, e.g., "remote", "qemu", or "util.json". The 'match' in the

What about users who use libvirt from a distro package, they don't necessary need to have the sources installed, more importantly they shouldn't really have to care about the sources to successfully set up logging. Reporting the categories in some consumable way that could be generated automatically during libvirt build and shipped afterwards has been on my radar for quite some time...

+# filter matches using shell wildcard syntax (see 'man glob(7)'). +# The 'match' is always treated a substring match. IOW a match +# string 'foo' is equivalent to '*foo*'. +# +# If 'match' contains the optional "+" prefix, it tells libvirt +# to log stack trace for each message matching name. +# +# 'level' is the minimal level where matching messages should +# be logged: +# # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # -# Multiple filter can be defined in a single @filters, they just need to be -# separated by spaces. +# Multiple filters can be defined in a single @filters, they just need to be +# separated by spaces. Note that libvirt performs "first" match, i.e. if +# there are concurrent filters, the first one that matches will be applied, +# given the order in log_filters. +# +# For the virtlockd daemon, a typical need is to capture information +# from the locking code and some of the utility code. Some utility +# code is very verbose and is generally not desired. Taking the QEMU +# hypervisor as an example, a suitable filter string for debugging +# might be to turn off object, json & event logging, but enable the +# rest of the util code: # -# e.g. to only get warning or errors from the remote layer and only errors -# from the event layer: -#log_filters="3:remote 4:event" +#log_filters="1:locking 4:object 4:json 4:event 1:util"

# Logging outputs: # An output is one of the places to save logging information # The format for an output can be: -# x:stderr +# level:stderr # output goes to stderr -# x:syslog:name +# level:syslog:name # use syslog for the output and use the given name as the ident -# x:file:file_path +# level:file:file_path # output to a file, with the given filepath -# In all case the x prefix is the minimal level, acting as a filter +# level:journald +# output to journald logging system +# In all cases 'level' is the minimal priority, acting as a filter # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # -# Multiple output can be defined, they just need to be separated by spaces. -# e.g. to log all warnings and errors to syslog under the virtlockd ident: +# Multiple outputs can be defined, they just need to be separated by spaces. +# e.g. to log all warnings and errors to syslog under the libvirtd ident: #log_outputs="3:syslog:virtlockd" #

diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.aug.in index 744f3246af..a29e7e3730 100644 --- a/src/logging/test_virtlogd.aug.in +++ b/src/logging/test_virtlogd.aug.in @@ -3,7 +3,7 @@ module Test_virtlogd =

test Virtlogd.lns get conf = { "log_level" = "3" } - { "log_filters" = "3:remote 4:event" } + { "log_filters" = "1:logging 4:object 4:json 4:event 1:util" } { "log_outputs" = "3:syslog:virtlogd" } { "max_clients" = "1024" } { "admin_max_clients" = "5" } diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index c22b7737ef..f2078a730c 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -8,49 +8,80 @@

# Logging level: 4 errors, 3 warnings, 2 information, 1 debug # basically 1 will log everything possible +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. +# +# WARNING: It outputs too much information to practically read. +# WARNING: The "log_filters" setting is recommended instead. +# +# WARNING: Journald may employ rate limiting of the messages logged +# WARNING: and thus lock up the libvirt daemon. To use the debug +# WARNING: level with journald you have to specify it explicitly in +# WARNING: 'log_outputs', otherwise only information level messages +# WARNING: will be logged. +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. #log_level = 3

# Logging filters: # A filter allows to select a different logging level for a given category -# of logs -# The format for a filter is one of: -# x:name -# x:+name -# where name is a string which is matched against source file name, -# e.g., "remote", "qemu", or "util/json", the optional "+" prefix -# tells libvirt to log stack trace for each message matching name, -# and x is the minimal level where matching messages should be logged: +# of logs. The format for a filter is one of: +# +# level:match +# level:+match +# +# where 'match' is a string which is matched against the category +# given in the VIR_LOG_INIT() at the top of each libvirt source +# file, e.g., "remote", "qemu", or "util.json". The 'match' in the +# filter matches using shell wildcard syntax (see 'man glob(7)'). +# The 'match' is always treated a substring match. IOW a match +# string 'foo' is equivalent to '*foo*'. +# +# If 'match' contains the optional "+" prefix, it tells libvirt +# to log stack trace for each message matching name. +# +# 'level' is the minimal level where matching messages should +# be logged: +# # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # -# Multiple filter can be defined in a single @filters, they just need to be -# separated by spaces. +# Multiple filters can be defined in a single @filters, they just need to be +# separated by spaces. Note that libvirt performs "first" match, i.e. if +# there are concurrent filters, the first one that matches will be applied, +# given the order in log_filters. +# +# +# For the virtlockd daemon, a typical need is to capture information +# from the locking code and some of the utility code. Some utility +# code is very verbose and is generally not desired. Taking the QEMU +# hypervisor as an example, a suitable filter string for debugging +# might be to turn off object, json & event logging, but enable the +# rest of the util code:

^This paragraph is a copy-paste from virtlockd bits, so this needs to be fixed.

# -# e.g. to only get warning or errors from the remote layer and only errors -# from the event layer: -#log_filters="3:remote 4:event" +#log_filters="1:logging 4:object 4:json 4:event 1:util"

# Logging outputs: # An output is one of the places to save logging information # The format for an output can be: -# x:stderr +# level:stderr # output goes to stderr -# x:syslog:name +# level:syslog:name # use syslog for the output and use the given name as the ident -# x:file:file_path +# level:file:file_path # output to a file, with the given filepath -# x:journald -# ouput to the systemd journal -# In all case the x prefix is the minimal level, acting as a filter +# level:journald +# output to journald logging system +# In all cases 'level' is the minimal priority, acting as a filter # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # -# Multiple output can be defined, they just need to be separated by spaces. -# e.g. to log all warnings and errors to syslog under the virtlogd ident: +# Multiple outputs can be defined, they just need to be separated by spaces. +# e.g. to log all warnings and errors to syslog under the libvirtd ident:

"under libvirt indent" - this doesn't reflect the reality below... there's one more occurrence of this within this patch... Erik

On Fri, Apr 20, 2018 at 05:56:39PM +0100, Daniel P. Berrangé wrote:

Strongly recommend against use of the log_levels setting since it creates overly verbose logs and has a serious performance impact.

Describe the log filter syntax better and mention use of shell glob syntax. Also provide more realistic example of good settings to use. The libvirtd example is biased towards QEMU, but when the drivers split off each daemon can get its own more appropriate example.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> ---

[...] Besides couple of ultra minor things, the core change looks good to me.

+# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. +# +# WARNING: It outputs too much information to practically read. +# WARNING: The "log_filters" setting is recommended instead. +# +# WARNING: Journald may employ rate limiting of the messages logged +# WARNING: and thus lock up the libvirt daemon. To use the debug +# WARNING: level with journald you have to specify it explicitly in +# WARNING: 'log_outputs', otherwise only information level messages +# WARNING: will be logged.

I see you said in your reply to Erik that you're going to reword the above. That said ...

+# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. #log_level = 3

... the above bit reads slightly confusing, as it implies using 'log_level = 3' is discouraged, while (I think) you mean that use of 'log_level' in general is discouraged. Unless I'm misreading it. [...]

-# Multiple filter can be defined in a single @filters, they just need to be -# separated by spaces. +# Multiple filters can be defined in a single @filters, they just need to be +# separated by spaces. Note that libvirt performs "first" match, i.e. if +# there are concurrent filters, the first one that matches will be applied, +# given the order in log_filters. +# +# For the virtlockd daemon, a typical need is to capture information +# from the locking code and some of the utility code. Some utility +# code is very verbose and is generally not desired. Taking the QEMU +# hypervisor as an example, a suitable filter string for debugging +# might be to turn off object, json & event logging, but enable the

OCD comment (applies to all occurrences of this block of text): Either s/json/JSON to read as a sentence. Or I'd put them in single quotes: 'object', 'json' & 'event', 'util' to indicate they're special.

+# rest of the util code: # -# e.g. to only get warning or errors from the remote layer and only errors -# from the event layer: -#log_filters="3:remote 4:event" +#log_filters="1:locking 4:object 4:json 4:event 1:util"

# Logging outputs: # An output is one of the places to save logging information # The format for an output can be: -# x:stderr +# level:stderr # output goes to stderr -# x:syslog:name +# level:syslog:name # use syslog for the output and use the given name as the ident -# x:file:file_path +# level:file:file_path # output to a file, with the given filepath -# In all case the x prefix is the minimal level, acting as a filter +# level:journald +# output to journald logging system +# In all cases 'level' is the minimal priority, acting as a filter # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # -# Multiple output can be defined, they just need to be separated by spaces. -# e.g. to log all warnings and errors to syslog under the virtlockd ident: +# Multiple outputs can be defined, they just need to be separated by spaces. +# e.g. to log all warnings and errors to syslog under the libvirtd ident:

Super nit, pre-existing: s/e.g./E.g./ (Since it's the start of a sentence)

#log_outputs="3:syslog:virtlockd" #

diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.aug.in index 744f3246af..a29e7e3730 100644 --- a/src/logging/test_virtlogd.aug.in +++ b/src/logging/test_virtlogd.aug.in @@ -3,7 +3,7 @@ module Test_virtlogd =

test Virtlogd.lns get conf = { "log_level" = "3" } - { "log_filters" = "3:remote 4:event" } + { "log_filters" = "1:logging 4:object 4:json 4:event 1:util" } { "log_outputs" = "3:syslog:virtlogd" } { "max_clients" = "1024" } { "admin_max_clients" = "5" } diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index c22b7737ef..f2078a730c 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -8,49 +8,80 @@

# Logging level: 4 errors, 3 warnings, 2 information, 1 debug # basically 1 will log everything possible +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. +# +# WARNING: It outputs too much information to practically read. +# WARNING: The "log_filters" setting is recommended instead. +# +# WARNING: Journald may employ rate limiting of the messages logged +# WARNING: and thus lock up the libvirt daemon. To use the debug +# WARNING: level with journald you have to specify it explicitly in +# WARNING: 'log_outputs', otherwise only information level messages +# WARNING: will be logged. +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. #log_level = 3

Here, too. I'll interpret the above as: "Using 'log_level' is strongly discouraged". So probably: s/USE OF/USE OF `log_level`/ [...]

+# +# where 'match' is a string which is matched against the category +# given in the VIR_LOG_INIT() at the top of each libvirt source +# file, e.g., "remote", "qemu", or "util.json". The 'match' in the +# filter matches using shell wildcard syntax (see 'man glob(7)'). +# The 'match' is always treated a substring match. IOW a match +# string 'foo' is equivalent to '*foo*'. +# +# If 'match' contains the optional "+" prefix, it tells libvirt +# to log stack trace for each message matching name. +# +# 'level' is the minimal level where matching messages should +# be logged: +# # 1: DEBUG # 2: INFO # 3: WARNING @@ -370,22 +383,27 @@ # there are concurrent filters, the first one that matches will be applied, # given the order in log_filters. # -# e.g. to only get warning or errors from the remote layer and only errors -# from the event layer: -#log_filters="3:remote 4:event" +# A typical need is to capture information from a hypervisor driver, +# public API entrypoints and some of the utility code. Some utility

Nit: s/entrypoint/entry points/ Thanks for the patch. [...] -- /kashyap