1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From 222820c67cea17ed76024364dcdd08778d1232fc Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Tue, 29 Jul 2014 09:54:17 -0700
Subject: [PATCH] tests: Turn off appctl poll_loop logging for long output.
One of the VMware internal autobuilder builds failed due to extraneous
logging in these tests of the form:
2014-07-28T21:11:07Z|00001|poll_loop|INFO|wakeup due to [POLLIN] on fd 3
(...) at lib/stream-fd-unix.c:124 (93% CPU usage)
I think this must be because these tests have tons of output and so on a
loaded machine it can take some CPU to pull it down. We don't want to fail
for that reason, so disable this logging.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ansis Atteka <aatteka@nicira.com>
---
tests/ofproto-dpif.at | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 9ee1698..0253cb0 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -5458,7 +5458,7 @@ AT_BANNER([ofproto-dpif - flow translation resource limits])
AT_SETUP([ofproto-dpif - infinite resubmit])
OVS_VSWITCHD_START
AT_CHECK([ovs-ofctl add-flow br0 actions=resubmit:1,resubmit:2,output:3])
-AT_CHECK([ovs-appctl ofproto/trace br0 'eth_dst=ff:ff:ff:ff:ff:ff'],
+AT_CHECK([ovs-appctl -vpoll_loop:off ofproto/trace br0 'eth_dst=ff:ff:ff:ff:ff:ff'],
[0], [stdout])
AT_CHECK([tail -1 stdout], [0], [Datapath actions: drop
])
@@ -5477,7 +5477,7 @@ ADD_OF_PORTS([br0], 1)
done
echo "in_port=65, actions=local") > flows
AT_CHECK([ovs-ofctl add-flows br0 flows])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1'], [0], [stdout])
+AT_CHECK([ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'], [0], [stdout])
AT_CHECK([grep -c 'over 4096 resubmit actions' ovs-vswitchd.log], [0], [1
])
OVS_VSWITCHD_STOP(["/over.*resubmit actions/d"])
@@ -5492,7 +5492,7 @@ ADD_OF_PORTS([br0], 1)
done
echo "in_port=13, actions=local,local,local,local,local,local,local,local") > flows
AT_CHECK([ovs-ofctl add-flows br0 flows])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1'], [0], [stdout])
+AT_CHECK([ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'], [0], [stdout])
AT_CHECK([grep -c -e '- Uses action(s) not supported by datapath' stdout],
[0], [1
])
@@ -5511,7 +5511,7 @@ ADD_OF_PORTS([br0], 1)
push="push:NXM_NX_REG0[[]]"
echo "in_port=13, actions=$push,$push,$push,$push,$push,$push,$push,$push") > flows
AT_CHECK([ovs-ofctl add-flows br0 flows])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1'], [0], [stdout])
+AT_CHECK([ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'], [0], [stdout])
AT_CHECK([grep -c 'resubmits yielded over 64 kB of stack' ovs-vswitchd.log], [0], [1
])
OVS_VSWITCHD_STOP(["/resubmits yielded over 64 kB of stack/d"])
--
1.9.1
|
