Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356107 )
Change subject: labstore: remove TC=$(which tc)
......................................................................
labstore: remove TC=$(which tc)
There is some point in doing TC=/sbin/tc and then using $TC (that is, to
avoid using the invoking user's $PATH), but little point in doing
TC=$(which tc). Remove that and refer to "tc" directly, as it's cleaner.
Change-Id: Iec93b4c3f7def911da8e5160f5a9a167907f8e04
---
M modules/labstore/templates/tc-setup.sh.erb
1 file changed, 28 insertions(+), 30 deletions(-)
Approvals:
Madhuvishy: Verified; Looks good to me, approved
diff --git a/modules/labstore/templates/tc-setup.sh.erb
b/modules/labstore/templates/tc-setup.sh.erb
index 35550fc..dc9ca63 100644
--- a/modules/labstore/templates/tc-setup.sh.erb
+++ b/modules/labstore/templates/tc-setup.sh.erb
@@ -16,15 +16,13 @@
nfs_dumps_read='<%= @nfs_dumps_read %>'
eth0_egress='<%= @eth0_egress %>'
-TC=$(which tc)
-
function clean_ingress {
- $TC qdisc del dev eth0 handle ffff: ingress
- $TC qdisc del dev ifb0 root
+ tc qdisc del dev eth0 handle ffff: ingress
+ tc qdisc del dev ifb0 root
}
function clean_egress {
- $TC qdisc del dev eth0 root
+ tc qdisc del dev eth0 root
}
function ensure_mod {
@@ -51,34 +49,34 @@
clean_egress
-$TC qdisc add dev eth0 root handle 1: htb default 100
+tc qdisc add dev eth0 root handle 1: htb default 100
-$TC class add dev eth0 parent 1: classid 1:1 htb rate $nfs_write
+tc class add dev eth0 parent 1: classid 1:1 htb rate $nfs_write
-$TC class add dev eth0 parent 1: classid 1:2 htb rate $nfs_write
+tc class add dev eth0 parent 1: classid 1:2 htb rate $nfs_write
-$TC class add dev eth0 parent 1: classid 1:3 htb rate $nfs_write
+tc class add dev eth0 parent 1: classid 1:3 htb rate $nfs_write
-$TC class add dev eth0 parent 1: classid 1:4 htb rate $nfs_write
+tc class add dev eth0 parent 1: classid 1:4 htb rate $nfs_write
-$TC class add dev eth0 parent 1: classid 1:5 htb rate $nfs_write
+tc class add dev eth0 parent 1: classid 1:5 htb rate $nfs_write
-$TC class add dev eth0 parent 1: classid 1:100 htb rate $eth0_egress
+tc class add dev eth0 parent 1: classid 1:100 htb rate $eth0_egress
-$TC filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.6 flowid 1:1
-$TC filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.7 flowid 1:2
-$TC filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.10 flowid 1:3
# scratch is on labstore1003 for now
-$TC filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.4.10 flowid 1:4
-$TC filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.18 flowid 1:5
#-------------------------------------
@@ -86,7 +84,7 @@
clean_ingress
# Create ingress on external interface
-$TC qdisc add dev eth0 handle ffff: ingress
+tc qdisc add dev eth0 handle ffff: ingress
# this link has to come up for ingress shaping
/sbin/ip link set dev ifb0 up
@@ -99,32 +97,32 @@
fi
# pass engress traffic through ifb0
-$TC filter add dev eth0 parent ffff: protocol all u32 \
+tc filter add dev eth0 parent ffff: protocol all u32 \
match u32 0 0 action mirred egress redirect dev ifb0
-$TC qdisc add dev ifb0 root handle 1: htb
+tc qdisc add dev ifb0 root handle 1: htb
-$TC class add dev ifb0 parent 1: classid 1:1 htb rate $nfs_read
+tc class add dev ifb0 parent 1: classid 1:1 htb rate $nfs_read
-$TC class add dev ifb0 parent 1: classid 1:2 htb rate $nfs_read
+tc class add dev ifb0 parent 1: classid 1:2 htb rate $nfs_read
-$TC class add dev ifb0 parent 1: classid 1:3 htb rate $nfs_read
+tc class add dev ifb0 parent 1: classid 1:3 htb rate $nfs_read
-$TC class add dev ifb0 parent 1: classid 1:4 htb rate $nfs_dumps_read
+tc class add dev ifb0 parent 1: classid 1:4 htb rate $nfs_dumps_read
-$TC class add dev ifb0 parent 1: classid 1:5 htb rate $nfs_read
+tc class add dev ifb0 parent 1: classid 1:5 htb rate $nfs_read
-$TC filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
match ip src 10.64.37.6 flowid 1:1
-$TC filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
match ip src 10.64.37.7 flowid 1:2
-$TC filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
match ip src 10.64.37.10 flowid 1:3
-$TC filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
match ip src 10.64.4.10 flowid 1:4
-$TC filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev ifb0 parent 1: protocol ip prio 0 u32 \
match ip src 10.64.37.18 flowid 1:5
--
To view, visit https://gerrit.wikimedia.org/r/356107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec93b4c3f7def911da8e5160f5a9a167907f8e04
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Madhuvishy <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
