projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: introduce --group-output-by-session
[lttng-tools.git]
/
tests
/
regression
/
tools
/
streaming
/
test_high_throughput_limits
diff --git
a/tests/regression/tools/streaming/test_high_throughput_limits
b/tests/regression/tools/streaming/test_high_throughput_limits
index 32c3f1f2b939abc060b0e256bc87b37eb56d3269..1bcf35328691e7807a51523374bab2a097f40b9d 100755
(executable)
--- a/
tests/regression/tools/streaming/test_high_throughput_limits
+++ b/
tests/regression/tools/streaming/test_high_throughput_limits
@@
-41,6
+41,12
@@
if [ ! -x "$TESTAPP_BIN" ]; then
BAIL_OUT "No UST events binary detected."
fi
BAIL_OUT "No UST events binary detected."
fi
+function reset_bw_limit
+{
+ tc qdisc del dev $DEFAULT_IF root >/dev/null 2>&1
+ return $?
+}
+
function set_bw_limit
{
limit=$1
function set_bw_limit
{
limit=$1
@@
-51,28
+57,47
@@
function set_bw_limit
# parent qdisc (1:) will always limit us to the right max value
dataportlimit=$((9*${ctrlportlimit}))
# parent qdisc (1:) will always limit us to the right max value
dataportlimit=$((9*${ctrlportlimit}))
+ diag "Set bandwidth limits to ${limit}kbits, ${ctrlportlimit} for control and ${dataportlimit} for data"
tc qdisc add dev $DEFAULT_IF root handle 1: htb default 15 >/dev/null 2>&1
tc qdisc add dev $DEFAULT_IF root handle 1: htb default 15 >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ reset_bw_limit
+ return 1
+ fi
# the total bandwidth is the limit set by the user
tc class add dev $DEFAULT_IF parent 1: classid 1:1 htb rate ${limit}kbit ceil ${limit}kbit >/dev/null 2>&1
# the total bandwidth is the limit set by the user
tc class add dev $DEFAULT_IF parent 1: classid 1:1 htb rate ${limit}kbit ceil ${limit}kbit >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ reset_bw_limit
+ return 1
+ fi
# 1/10 of the bandwidth guaranteed and traffic prioritized for the control port
tc class add dev $DEFAULT_IF parent 1:1 classid 1:10 htb rate ${ctrlportlimit}kbit ceil ${limit}kbit prio 1 >/dev/null 2>&1
# 1/10 of the bandwidth guaranteed and traffic prioritized for the control port
tc class add dev $DEFAULT_IF parent 1:1 classid 1:10 htb rate ${ctrlportlimit}kbit ceil ${limit}kbit prio 1 >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ reset_bw_limit
+ return 1
+ fi
# 9/10 of the bandwidth guaranteed and can borrow up to the total bandwidth (if unused)
tc class add dev $DEFAULT_IF parent 1:1 classid 1:11 htb rate ${dataportlimit}kbit ceil ${limit}kbit prio 2 >/dev/null 2>&1
# 9/10 of the bandwidth guaranteed and can borrow up to the total bandwidth (if unused)
tc class add dev $DEFAULT_IF parent 1:1 classid 1:11 htb rate ${dataportlimit}kbit ceil ${limit}kbit prio 2 >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ reset_bw_limit
+ return 1
+ fi
# filter to assign control traffic to the 1:10 class
tc filter add dev $DEFAULT_IF parent 1: protocol ip u32 match ip dport $SESSIOND_CTRL_PORT 0xffff flowid 1:10 >/dev/null 2>&1
# filter to assign control traffic to the 1:10 class
tc filter add dev $DEFAULT_IF parent 1: protocol ip u32 match ip dport $SESSIOND_CTRL_PORT 0xffff flowid 1:10 >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ reset_bw_limit
+ return 1
+ fi
# filter to assign data traffic to the 1:11 class
tc filter add dev $DEFAULT_IF parent 1: protocol ip u32 match ip dport $SESSIOND_DATA_PORT 0xffff flowid 1:11 >/dev/null 2>&1
# filter to assign data traffic to the 1:11 class
tc filter add dev $DEFAULT_IF parent 1: protocol ip u32 match ip dport $SESSIOND_DATA_PORT 0xffff flowid 1:11 >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ reset_bw_limit
+ return 1
+ fi
- ok $? "Set bandwidth limits to ${limit}kbits, ${ctrlportlimit} for control and ${dataportlimit} for data"
-}
-
-function reset_bw_limit
-{
- tc qdisc del dev $DEFAULT_IF root >/dev/null 2>&1
- ok $? "Reset bandwith limits"
+ return 0
}
function create_lttng_session_with_uri
}
function create_lttng_session_with_uri
@@
-148,10
+173,9
@@
function validate_event_count
function interrupt_cleanup()
{
diag "*** Exiting ***"
function interrupt_cleanup()
{
diag "*** Exiting ***"
- stop_lttng_relayd
- stop_lttng_sessiond
reset_bw_limit
reset_bw_limit
- exit 1
+ # invoke utils cleanup
+ full_cleanup
}
plan_tests $NUM_TESTS
}
plan_tests $NUM_TESTS
@@
-168,8
+192,7
@@
skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
{
# Catch sigint and try to cleanup limits
{
# Catch sigint and try to cleanup limits
- trap interrupt_cleanup SIGTERM
- trap interrupt_cleanup SIGINT
+ trap interrupt_cleanup SIGTERM SIGINT
BW_LIMITS=(3200 1600 800 400 200 100 50 25)
for BW in ${BW_LIMITS[@]};
BW_LIMITS=(3200 1600 800 400 200 100 50 25)
for BW in ${BW_LIMITS[@]};
@@
-177,6
+200,7
@@
skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
diag "Test high-throughput with bandwidth limit set to ${BW}kbits"
set_bw_limit $BW
diag "Test high-throughput with bandwidth limit set to ${BW}kbits"
set_bw_limit $BW
+ ok $? "Setting bandwidth limit"
start_lttng_sessiond
start_lttng_relayd "-o $TRACE_PATH"
start_lttng_sessiond
start_lttng_relayd "-o $TRACE_PATH"
@@
-185,5
+209,6
@@
skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
stop_lttng_relayd
stop_lttng_sessiond
reset_bw_limit
stop_lttng_relayd
stop_lttng_sessiond
reset_bw_limit
+ ok $? "Reset bandwith limits"
done
}
done
}
This page took
0.024327 seconds
and
4
git commands to generate.