forked from pool/openvswitch
61 lines
2.4 KiB
Diff
61 lines
2.4 KiB
Diff
|
From fb496f92ca1eeead8760b5cdfd857165f64deadf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Numan Siddique <nusiddiq@redhat.com>
|
||
|
|
Date: Mon, 21 Dec 2015 12:31:14 +0530
|
||
|
|
Subject: [PATCH] Remove broken pipe warning logs from ovsdb-server.log for ovn
|
||
|
|
tests
|
||
|
|
|
||
|
|
Taken the fix from the commit d3292dd... (in ovn-controller-vtep.at)
|
||
|
|
|
||
|
|
Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
|
||
|
|
Signed-off-by: Russell Bryant <rbryant@redhat.com>
|
||
|
|
---
|
||
|
|
tests/ovn-nbctl.at | 10 +++++++++-
|
||
|
|
tests/ovn-sbctl.at | 10 +++++++++-
|
||
|
|
2 files changed, 18 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at
|
||
|
|
index 5358f1e..efad8a2 100644
|
||
|
|
--- a/tests/ovn-nbctl.at
|
||
|
|
+++ b/tests/ovn-nbctl.at
|
||
|
|
@@ -16,7 +16,15 @@ m4_define([OVN_NBCTL_TEST_START],
|
||
|
|
|
||
|
|
# OVN_NBCTL_TEST_STOP
|
||
|
|
m4_define([OVN_NBCTL_TEST_STOP],
|
||
|
|
- [AT_CHECK([check_logs $1])
|
||
|
|
+ [# removes all 'Broken pipe' warning logs from ovsdb-server.log. this is in
|
||
|
|
+ # that *ctl command (e.g. ovn-nbctl) exits right after committing the change
|
||
|
|
+ # to database. however, in reaction, some daemon (e.g. ovn-controller-vtep)
|
||
|
|
+ # 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.
|
||
|
|
+ AT_CHECK([check_logs "$1
|
||
|
|
+/Broken pipe/d"])
|
||
|
|
AT_CHECK([ovs-appctl -t ovsdb-server exit])])
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/tests/ovn-sbctl.at b/tests/ovn-sbctl.at
|
||
|
|
index 9986d9a..4c7cf87 100644
|
||
|
|
--- a/tests/ovn-sbctl.at
|
||
|
|
+++ b/tests/ovn-sbctl.at
|
||
|
|
@@ -25,7 +25,15 @@ m4_define([OVN_SBCTL_TEST_START],
|
||
|
|
|
||
|
|
# OVN_SBCTL_TEST_STOP
|
||
|
|
m4_define([OVN_SBCTL_TEST_STOP],
|
||
|
|
- [AT_CHECK([check_logs $1])
|
||
|
|
+ [# removes all 'Broken pipe' warning logs from ovsdb-server.log. this is in
|
||
|
|
+ # that *ctl command (e.g. ovn-nbctl) exits right after committing the change
|
||
|
|
+ # to database. however, in reaction, some daemon (e.g. ovn-controller-vtep)
|
||
|
|
+ # 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.
|
||
|
|
+ AT_CHECK([check_logs "$1
|
||
|
|
+/Broken pipe/d"])
|
||
|
|
AT_CHECK([ovs-appctl -t ovn-northd exit])
|
||
|
|
AT_CHECK([ovs-appctl -t ovsdb-server exit])])
|
||
|
|
|
||
|
|
--
|
||
|
|
2.8.3
|
||
|
|
|