From: Lance Richardson Date: Thu, 7 Jul 2016 21:30:01 +0000 (-0400) Subject: ovn-sbctl: eliminate a spurious test case error cause X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=247447ff964f0d1767d22f87249bae91d87a40e6 ovn-sbctl: eliminate a spurious test case error cause The "ovn-sbctl" test fails occasionally due to log messages similar to these: jsonrpc|WARN|unix: receive error: Connection reset by peer reconnect|WARN|unix: connection dropped (Connection reset by peer) Since we're already ignoring "Broken pipe" messages in this test case, and the difference between EPIPE and ECONNRESET on send is simply a matter of whether the peer had unconsumed data in its receive buffer when the peer socket was closed, it should be OK to ignore "reset by peer" logs as well. This same type of failure has been observed in ovs-nbctl and ovn-vtep-controller tests, so fix it there as well. Signed-off-by: Lance Richardson Acked-by: Ryan Moats Signed-off-by: Russell Bryant --- diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at index c9781372a..8eca16c27 100644 --- a/tests/ovn-controller-vtep.at +++ b/tests/ovn-controller-vtep.at @@ -86,8 +86,12 @@ m4_define([OVN_CONTROLLER_VTEP_STOP], # may immediately update the database. this later update may cause database # sending update back to *ctl command if *ctl has not proceeded to exit yet. # and if *ctl command exits before database calling send, the send from - # database will fail with 'Broken pipe' error. + # database will fail with 'Broken pipe' error. Also removes all "connection + # reset" warning logs by a similar rationale (either EPIPE or ECONNRESET can + # be returned on a send depending on whether the peer had unconsumed data when + # it closed the socket). AT_CHECK([check_logs "$1 +/reset by peer/d /Broken pipe/d"]) OVS_APP_EXIT_AND_WAIT([ovs-vtep]) OVS_APP_EXIT_AND_WAIT([ovn-northd]) diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 42b2d36f8..8e8580187 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -23,8 +23,12 @@ m4_define([OVN_NBCTL_TEST_STOP], # may immediately update the database. this later update may cause database # sending update back to *ctl command if *ctl has not proceeded to exit yet. # and if *ctl command exits before database calling send, the send from - # database will fail with 'Broken pipe' error. + # database will fail with 'Broken pipe' error. Also removes all "connection + # reset" warning logs by a similar rationale (either EPIPE or ECONNRESET can + # be returned on a send depending on whether the peer had unconsumed data when + # it closed the socket). AT_CHECK([check_logs "$1 +/reset by peer/d /Broken pipe/d"]) OVS_APP_EXIT_AND_WAIT([ovsdb-server])]) diff --git a/tests/ovn-sbctl.at b/tests/ovn-sbctl.at index 3b61d9da5..72dc441d9 100644 --- a/tests/ovn-sbctl.at +++ b/tests/ovn-sbctl.at @@ -33,8 +33,12 @@ m4_define([OVN_SBCTL_TEST_STOP], # may immediately update the database. this later update may cause database # sending update back to *ctl command if *ctl has not proceeded to exit yet. # and if *ctl command exits before database calling send, the send from - # database will fail with 'Broken pipe' error. + # database will fail with 'Broken pipe' error. Also removes all "connection + # reset" warning logs by a similar rationale (either EPIPE or ECONNRESET can + # be returned on a send depending on whether the peer had unconsumed data when + # it closed the socket). AT_CHECK([check_logs "$1 +/reset by peer/d /Broken pipe/d"]) OVS_APP_EXIT_AND_WAIT([ovn-northd]) OVS_APP_EXIT_AND_WAIT_BY_TARGET([$OVS_RUNDIR/ovnnb_db.ctl], [$OVS_RUNDIR/ovnnb_db.pid])