[ovs-dev] [PATCH] ofproto-macros: Ignore "Dropped # log messages" in check_logs.

Ben Pfaff blp at ovn.org
Tue Jul 3 18:32:18 UTC 2018


check_logs ignores some log messages, but it wasn't smart enough to ignore
the messages that said that the ignored messages had been rate-limited.
This fixes the problem.

It's OK to ignore all rate-limiting messages because they only appear if at
least one message was not rate-limited, which check_logs will catch anyway.

Reported-by: Timothy Redaelli <tredaelli at redhat.com>
Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-July/046978.html
Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 tests/ofproto-macros.at | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 7388a20a2236..2a56ae6e2f3e 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -400,6 +400,11 @@ check_logs () {
     # all "connection reset" warning logs for similar reasons (either EPIPE or
     # ECONNRESET can be returned on a send depending on whether the peer had
     # unconsumed data when it closed the socket).
+    #
+    # We also ignore "Dropped # log messages..." messages.  Otherwise, even if
+    # we ignore the messages that were rate-limited, we can end up failing just
+    # because of the announcement that rate-limiting happened (and in a racy,
+    # timing-dependent way, too).
     sed -n "$1
 /reset by peer/d
 /Broken pipe/d
@@ -408,6 +413,7 @@ check_logs () {
 /timeval.*disk: [[0-9]]* reads, [[0-9]]* writes/d
 /timeval.*context switches: [[0-9]]* voluntary, [[0-9]]* involuntary/d
 /ovs_rcu.*blocked [[0-9]]* ms waiting for .* to quiesce/d
+/Dropped [[0-9]]* log messages/d
 /|WARN|/p
 /|ERR|/p
 /|EMER|/p" ${logs}
-- 
2.16.1



More information about the dev mailing list