d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bridge tests: Avoid building a switching loop

Browse Source 
Enable STP before bringing the bridges up. This avoids a switching loop,
which has a tendency to drown out progress in userspace processes,
especially on single-core systems.

Only check that we have indeed shut down one of the looped interfaces

PR:		246448
Reviewed by:	melifaro
Differential Revision:	https://reviews.freebsd.org/D25084
This commit is contained in:
Kristof Provost 2020-06-01 19:26:16 +00:00
parent 82c3a6548f
commit e07e002e95
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/sys/net/if_bridge_test.sh
View File

@ -72,7 +72,6 @@ stp_head()
{
atf_set descr 'Spanning tree test'
atf_set require.user root
atf_set require.progs jq
}
stp_body()
@ -91,13 +90,11 @@ stp_body()
vnet_mkjail a ${bridge_a} ${epair_one}a ${epair_two}a
vnet_mkjail b ${bridge_b} ${epair_one}b ${epair_two}b
jexec a ifconfig ${bridge_a} up
jexec a ifconfig ${epair_one}a up
jexec a ifconfig ${epair_two}a up
jexec a ifconfig ${bridge_a} addm ${epair_one}a
jexec a ifconfig ${bridge_a} addm ${epair_two}a
jexec b ifconfig ${bridge_b} up
jexec b ifconfig ${epair_one}b up
jexec b ifconfig ${epair_two}b up
jexec b ifconfig ${bridge_b} addm ${epair_one}b
@ -105,23 +102,15 @@ stp_body()
jexec a ifconfig ${bridge_a} 192.0.2.1/24
# Give the interfaces some time to come up and pass some traffic
sleep 5
# Confirm that there's looping traffic
nbr=$(jexec a netstat -I ${bridge_a} --libxo json \
| jq ".statistics.interface[0].\"received-packets\"")
if [ ${nbr} -lt 100 ]
then
atf_fail "Expected bridging loop, but found very few packets."
fi
# Enable spanning tree
jexec a ifconfig ${bridge_a} stp ${epair_one}a
jexec a ifconfig ${bridge_a} stp ${epair_two}a
jexec b ifconfig ${bridge_b} stp ${epair_one}b
jexec b ifconfig ${bridge_b} stp ${epair_two}b
jexec b ifconfig ${bridge_b} up
jexec a ifconfig ${bridge_a} up
# Give STP time to do its thing
sleep 5