[ovs-git] Open vSwitch: Merge commit 'origin/ctrix' into k (citrix)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, citrix has been updated
       via  7646deb6ec8c3a319573ac9ea9a19a60994f7cf3 (commit)
       via  e3951e76bcb6b65b5b4905afce9e2584909ac484 (commit)
       via  d4016a58d29a52f0e57f2f19f982d6e3a95c77d2 (commit)
       via  6bc995e46d64b90ef0b3186abec92f63eab2c2ad (commit)
      from  dc6fe1d7ee2f1dbafea795c110ccdbb54a5946e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7646deb6ec8c3a319573ac9ea9a19a60994f7cf3
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=7646deb6ec8c3a319573ac9ea9a19a60994f7cf3
Author: Justin Pettit <jpettit at nicira.com>
		
Merge commit 'origin/ctrix' into k
		


commit e3951e76bcb6b65b5b4905afce9e2584909ac484
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e3951e76bcb6b65b5b4905afce9e2584909ac484
Author: Justin Pettit <jpettit at nicira.com>
		
xenserver: Have ovs-brcompatd's log file rotated
		
Suggested by Ian Campbell.


commit d4016a58d29a52f0e57f2f19f982d6e3a95c77d2
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=d4016a58d29a52f0e57f2f19f982d6e3a95c77d2
Author: Justin Pettit <jpettit at nicira.com>
		
xenserver: Set default file log level and fix brcompatd file
		
Set the default log level for file logging to INFO for ovs-vswitchd and
ovs-brcompatd.  This is done so that coverage messages are kept in the
log file, since we no longer log them through syslog due its synchronous
writing on Xen hosts.  The issue is described in detail in commit 6bc995e.

Fix test for whether file logging should be enabled for ovs-brcompatd.

Reported by Ian Campbell.


commit 6bc995e46d64b90ef0b3186abec92f63eab2c2ad
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6bc995e46d64b90ef0b3186abec92f63eab2c2ad
Author: Justin Pettit <jpettit at nicira.com>
		
logging: Lower logging level for coverage messages due to slow poll loops
		
By default, many OVS processes keep track of their time through a poll
loop.  If it takes an unusually long time (measured as some distance
from the mean), the processes will log stats it has been keeping about
coverage.  It was doing this at level WARN.

On Xen systems, syslog messages written at level INFO and higher are
written to /var/log/messages synchronously.  This would mean that there
would be dire messages that it took a few dozen milliseconds to go
through the loop, meanwhile, it would take up to 6(!) seconds writing
those.  Meanwhile, the process would do no other processing, which could
be quite serious in the case of a process such as ovs-vswitchd.
This problem was somewhat masked because the time used by this logging
was not used in the calculations for determining how long it was taking
to get through the loop.

This commit lowers the default log level for those coverage messages to
INFO.  On Xen systems, it raises the default level at which messages are
written to syslog to WARN.

Diagnosed and fixed with the help of Ian Campbell.


-----------------------------------------------------------------------

Summary of changes:
 lib/coverage.c                    |    5 ++++-
 lib/timeval.c                     |    7 ++++++-
 xenserver/etc_init.d_vswitch      |   18 +++++++++++++-----
 xenserver/etc_logrotate.d_vswitch |    6 +++---
 4 files changed, 26 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Open vSwitch