Skip to contentSkip to conversation

lib/tst_net.sh: fix tst_set_sysctl() for non-netns setup

PATCH New Alexey Kodanev 2 participants 2 messages Jan 9, 2019 – Jan 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/tst_net.sh: fix tst_set_sysctl() for non-netns setup

When we don't use netns setup, $rparam is empty in tst_set_sysctl(), and tst_net_run() mistakenly set sysctl command to $rparam. This results to the following error, $cmd is empty:

bbr01 1 TINFO: timeout per run is 0h 20m 0s
bbr01 1 TINFO: emulate congestion with packet loss 0.5% bbr01 1 TINFO: compare 'cubic' and 'bbr' congestion alg. results bbr01 1 TINFO: setting cubic
bbr01 1 TBROK: tst_net_run: command not defined

---
 testcases/lib/tst_net.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
testcases/lib/tst_net.sh +2 -2
index 209cf9b..eca616f 100644
@@ -718,9 +718,9 @@ tst_set_sysctl()
 	[ "$3" = "safe" ] && safe="-s"
 
 	local rparam=
-	[ "$TST_USE_NETNS" = "yes" ] && rparam="-e"
+	[ "$TST_USE_NETNS" = "yes" ] && rparam="-r -e"
 
-	tst_net_run $safe -r $rparam "sysctl -q -w $name=$value"
+	tst_net_run $safe $rparam "sysctl -q -w $name=$value"
 }
 
 tst_cleanup_rhost()
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 lib/tst_net.sh: fix tst_set_sysctl() for non-netns setup

Hi Alexey,

..
thanks for your fix. I pushed it with minor change (was not needed, but made code more readable, I should have done it in original commit).

testcases/lib/tst_net.sh tst_set_sysctl() · line 721

Quoted 3 lines
testcases/lib/tst_net.sh +1 -1
 	local rparam=
-	[ "$TST_USE_NETNS" = "yes" ] && rparam="-e"
+	[ "$TST_USE_NETNS" = "yes" ] && rparam="-r -e"
    [ "$TST_USE_NETNS" = "yes" ] && rparam="-r '-e'"

Kind regards,
Petr