From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: joraj@efficios.com, jgalar@efficios.com
Cc: lttng-dev@lists.lttng.org
Subject: [PATCH lttng-tools 2/6] Fix: tests: error handling in high throughput limits test (v2)
Date: Thu, 16 May 2019 15:07:57 -0400 [thread overview]
Message-ID: <20190516190801.16878-2-mathieu.desnoyers__31517.7878875815$1558033732$gmane$org@efficios.com> (raw)
In-Reply-To: <20190516190801.16878-1-mathieu.desnoyers@efficios.com>
Each individual call to "tc" should be checked for error, else we
may fail to catch specific tc errors caused, for instance, by a
kernel configuration that only contains some of the required
class modules.
Also, invoke the utils.sh full_cleanup function from the script-specific
interrupt_cleanup trap handler rather than try to perform stopping
of relayd and sessiond within the script.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
Changes since v1:
- Issue reset_bw_limit when set_bw_limit fails.
---
.../streaming/test_high_throughput_limits | 48 ++++++++++++++-----
1 file changed, 37 insertions(+), 11 deletions(-)
diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits
index 32c3f1f2..5945bde7 100755
--- 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
+function reset_bw_limit
+{
+ tc qdisc del dev $DEFAULT_IF root >/dev/null 2>&1
+ return $?
+}
+
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}))
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
@@ -148,9 +173,9 @@ function validate_event_count
function interrupt_cleanup()
{
diag "*** Exiting ***"
- stop_lttng_relayd
- stop_lttng_sessiond
reset_bw_limit
+ # invoke utils cleanup
+ full_cleanup
exit 1
}
@@ -168,8 +193,7 @@ skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
{
# 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[@]};
@@ -177,6 +201,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
+ ok $? "Setting bandwidth limit"
start_lttng_sessiond
start_lttng_relayd "-o $TRACE_PATH"
@@ -185,5 +210,6 @@ skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
stop_lttng_relayd
stop_lttng_sessiond
reset_bw_limit
+ ok $? "Reset bandwith limits"
done
}
--
2.17.1
next parent reply other threads:[~2019-05-16 19:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190516190801.16878-1-mathieu.desnoyers@efficios.com>
2019-05-16 19:07 ` Mathieu Desnoyers [this message]
2019-05-16 19:07 ` [PATCH lttng-tools 3/6] Fix: utils.sh: handle SIGPIPE Mathieu Desnoyers
2019-05-16 19:07 ` [PATCH lttng-tools 4/6] Fix: test: utils.sh: exit from process on full_cleanup Mathieu Desnoyers
2019-05-16 19:08 ` [PATCH lttng-tools 5/6] Cleanup: test: don't stop relayd twice Mathieu Desnoyers
2019-05-16 19:08 ` [PATCH lttng-tools 6/6] tests: invoke full_cleanup from script trap handlers, use modprobe -r Mathieu Desnoyers
2019-09-05 20:54 ` [PATCH lttng-tools 1/6] Improve handling of test SIGTERM/SIGINT (v2) Jérémie Galarneau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20190516190801.16878-2-mathieu.desnoyers__31517.7878875815$1558033732$gmane$org@efficios.com' \
--to=mathieu.desnoyers@efficios.com \
--cc=jgalar@efficios.com \
--cc=joraj@efficios.com \
--cc=lttng-dev@lists.lttng.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).