diff --git a/test/cong_legacy_test.sh b/test/cong_legacy_test.sh index 34feb34..7e90b04 100644 --- a/test/cong_legacy_test.sh +++ b/test/cong_legacy_test.sh @@ -30,8 +30,8 @@ TIMEOUT=30 for FAMILY in ipv4 ipv6 ; do -for DROP_PERCENT in 0 5 ; do - +for DROP_PERCENT in 0 10; do + for LATENCY in "delay 100" ""; do for CLIENT_OPTS in "" "-R" ; do case $FAMILY in ipv4) @@ -56,10 +56,10 @@ for DROP_PERCENT in 0 5 ; do echo "Running ${MODE}..." test_run_cmd_local "ip netns exec $NETNS $IPERF3 -p $PORT -s &" if [[ $MODE != "baseline" ]]; then - test_run_cmd_local "$BPFTUNE -dsL -a tcp_conn_tuner.so &" true + test_run_cmd_local "$BPFTUNE -dsL &" true sleep $SETUPTIME # warm up connection... - for i in {1..20}; do + for i in {1..40}; do set +e $IPERF3 -fm $CLIENT_OPTS -p $PORT -t 1 -c $ADDR > /dev/null 2>&1 set -e @@ -121,6 +121,7 @@ for DROP_PERCENT in 0 5 ; do test_cleanup done + done done done diff --git a/test/cong_test.sh b/test/cong_test.sh index 2792de9..cb7aa0c 100644 --- a/test/cong_test.sh +++ b/test/cong_test.sh @@ -30,8 +30,8 @@ TIMEOUT=30 for FAMILY in ipv4 ipv6 ; do -for DROP_PERCENT in 0 5 ; do - +for DROP_PERCENT in 0 10; do + for LATENCY in "delay 100" ""; do for CLIENT_OPTS in "" "-R" ; do case $FAMILY in ipv4) @@ -56,10 +56,10 @@ for DROP_PERCENT in 0 5 ; do echo "Running ${MODE}..." test_run_cmd_local "ip netns exec $NETNS $IPERF3 -p $PORT -s &" if [[ $MODE != "baseline" ]]; then - test_run_cmd_local "$BPFTUNE -ds -a tcp_conn_tuner.so &" true + test_run_cmd_local "$BPFTUNE -ds &" true sleep $SETUPTIME # warm up connection... - for i in {1..20}; do + for i in {1..40}; do set +e $IPERF3 -fm $CLIENT_OPTS -p $PORT -t 1 -c $ADDR > /dev/null 2>&1 set -e @@ -121,6 +121,7 @@ for DROP_PERCENT in 0 5 ; do test_cleanup done + done done done diff --git a/test/test_lib.sh b/test/test_lib.sh index 5eb9578..e0ae631 100644 --- a/test/test_lib.sh +++ b/test/test_lib.sh @@ -225,10 +225,10 @@ test_setup_local() ip netns exec $NETNS ip link set $VETH1 up ip netns exec $NETNS sysctl -qw net.ipv4.conf.lo.rp_filter=0 if [[ -n "$DROP" ]] || [[ -n "$LATENCY" ]]; then - D=$DROP - if [[ -n "$DROP" ]]; then - D="${DROP}%" + if [[ -z "$DROP" ]]; then + DROP=0 fi + D="${DROP}%" tc qdisc add dev $VETH2 root netem loss ${D} ${LATENCY} ethtool -K $VETH2 gso off fi