BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355217 )
Change subject: RPS cleanup 3/5: pattern not necc for LVS
......................................................................
RPS cleanup 3/5: pattern not necc for LVS
The patterns being manually specified are now auto-detected, and
the specifiation of a pattern is not a good way to indicate
whether interface-rps should be run at all. Defaulting it to on
for the LVS case now. This also gets us to a state where nothing
is puppetized to use a custom RSS pattern, making further changes
easier.
Note because of the way the related interface::up_command work,
this will create duplicate /e/n/i commands on the LVS hosts and
need manual fixup there afterwards.
Change-Id: I1bcf39b3ff26992161e26e96d49d8fe7795766e8
---
M manifests/site.pp
M modules/interface/manifests/rps.pp
M modules/lvs/manifests/interface_tweaks.pp
3 files changed, 19 insertions(+), 21 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 2d85108..d9c446c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1516,10 +1516,10 @@
}
lvs::interface_tweaks {
- 'eth0': rss_pattern => 'eth0-%d';
- 'eth1': rss_pattern => 'eth1-%d';
- 'eth2': rss_pattern => 'eth2-%d';
- 'eth3': rss_pattern => 'eth3-%d';
+ 'eth0':;
+ 'eth1':;
+ 'eth2':;
+ 'eth3':;
}
}
@@ -1615,10 +1615,10 @@
}
lvs::interface_tweaks {
- 'eth0': bnx2x => true, txqlen => 10000, rss_pattern => 'eth0-fp-%d';
- 'eth1': bnx2x => true, txqlen => 10000, rss_pattern => 'eth1-fp-%d';
- 'eth2': bnx2x => true, txqlen => 10000, rss_pattern => 'eth2-fp-%d';
- 'eth3': bnx2x => true, txqlen => 10000, rss_pattern => 'eth3-fp-%d';
+ 'eth0': bnx2x => true, txqlen => 10000;
+ 'eth1': bnx2x => true, txqlen => 10000;
+ 'eth2': bnx2x => true, txqlen => 10000;
+ 'eth3': bnx2x => true, txqlen => 10000;
}
}
@@ -1715,10 +1715,10 @@
}
lvs::interface_tweaks {
- 'eth0': bnx2x => true, txqlen => 10000, rss_pattern => 'eth0-fp-%d';
- 'eth1': bnx2x => true, txqlen => 10000, rss_pattern => 'eth1-fp-%d';
- 'eth2': bnx2x => true, txqlen => 10000, rss_pattern => 'eth2-fp-%d';
- 'eth3': bnx2x => true, txqlen => 10000, rss_pattern => 'eth3-fp-%d';
+ 'eth0': bnx2x => true, txqlen => 10000;
+ 'eth1': bnx2x => true, txqlen => 10000;
+ 'eth2': bnx2x => true, txqlen => 10000;
+ 'eth3': bnx2x => true, txqlen => 10000;
}
}
@@ -1754,7 +1754,7 @@
# and driver updates for XPS).
lvs::interface_tweaks {
- 'eth0': bnx2x => true, txqlen => 20000, rss_pattern => 'eth0-fp-%d';
+ 'eth0': bnx2x => true, txqlen => 20000;
}
}
@@ -1768,7 +1768,7 @@
interface::add_ip6_mapped { 'main': }
lvs::interface_tweaks {
- 'eth0': bnx2x => true, txqlen => 10000, rss_pattern => 'eth0-fp-%d';
+ 'eth0': bnx2x => true, txqlen => 10000;
}
}
diff --git a/modules/interface/manifests/rps.pp
b/modules/interface/manifests/rps.pp
index 5a40bd7..0ea60f4 100644
--- a/modules/interface/manifests/rps.pp
+++ b/modules/interface/manifests/rps.pp
@@ -1,15 +1,12 @@
# Definition: interface::rps
#
-# Automagically sets RPS (and optionally, RSS) for an interface
+# Automagically sets RPS/RSS/XPS for an interface
#
# Parameters:
# - $interface:
# The network interface to operate on
# - $rss_pattern:
-# Optional RSS IRQ name pattern
-# If set (to hw-specific value), RSS will be enabled as well
-# Must contain a single "%d" format character for the queue number
-# (on bnx2x, this would be "eth0-fp-%d")
+# Optional RSS IRQ name pattern (normally auto-detected)
define interface::rps($interface=$name, $rss_pattern='') {
require interface::rpstools
require interface::rps::modparams
diff --git a/modules/lvs/manifests/interface_tweaks.pp
b/modules/lvs/manifests/interface_tweaks.pp
index 8bc4ad6..7af714d 100644
--- a/modules/lvs/manifests/interface_tweaks.pp
+++ b/modules/lvs/manifests/interface_tweaks.pp
@@ -5,7 +5,8 @@
$interface=$name,
$bnx2x=false,
$txqlen=false,
- $rss_pattern=false,
+ $rss_pattern='',
+ $do_rps=true,
) {
if $interface != $facts['interface_primary'] {
interface::manual { $name:
@@ -14,7 +15,7 @@
}
# RSS/RPS/XPS-type perf stuff (
https://www.kernel.org/doc/Documentation/networking/scaling.txt )
- if $rss_pattern {
+ if $do_rps {
interface::rps { $name:
interface => $interface,
rss_pattern => $rss_pattern,
--
To view, visit https://gerrit.wikimedia.org/r/355217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1bcf39b3ff26992161e26e96d49d8fe7795766e8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
