Skip to content

Commit 767389c

Browse files
Paolo Abenidavem330
authored andcommitted
selftests: mptcp: dump more info on errors
Even if that may sound completely unlikely, the mptcp implementation is not perfect, yet. When the self-tests report an error we usually need more information of what the scripts currently report. iproute allow provides some additional goodies since a few releases, let's dump them. Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c3ff3b0 commit 767389c

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

tools/testing/selftests/net/mptcp/mptcp_connect.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ cleanup()
128128
local netns
129129
for netns in "$ns1" "$ns2" "$ns3" "$ns4";do
130130
ip netns del $netns
131+
rm -f /tmp/$netns.{nstat,out}
131132
done
132133
}
133134

@@ -438,16 +439,24 @@ do_transfer()
438439
kill ${cappid_connector}
439440
fi
440441
442+
NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \
443+
nstat | grep Tcp > /tmp/${listener_ns}.out
444+
if [ ${listener_ns} != ${connector_ns} ]; then
445+
NSTAT_HISTORY=/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \
446+
nstat | grep Tcp > /tmp/${connector_ns}.out
447+
fi
448+
441449
local duration
442450
duration=$((stop-start))
443451
duration=$(printf "(duration %05sms)" $duration)
444452
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
445453
echo "$duration [ FAIL ] client exit code $retc, server $rets" 1>&2
446454
echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2
447-
ip netns exec ${listener_ns} ss -nita 1>&2 -o "sport = :$port"
455+
ip netns exec ${listener_ns} ss -Menita 1>&2 -o "sport = :$port"
456+
cat /tmp/${listener_ns}.out
448457
echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2
449-
ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port"
450-
458+
ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport = :$port"
459+
[ ${listener_ns} != ${connector_ns} ] && cat /tmp/${connector_ns}.out
451460
cat "$capout"
452461
return 1
453462
fi

0 commit comments

Comments
 (0)