BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355789 )
Change subject: interface-rps: refactor opts handling a bit
......................................................................
interface-rps: refactor opts handling a bit
Change-Id: I3ddb8adc1a7fe66fcd9663461ae99d7f96853364
---
M modules/interface/files/interface-rps.py
1 file changed, 11 insertions(+), 6 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/interface/files/interface-rps.py
b/modules/interface/files/interface-rps.py
index a54f825..fd768dd 100755
--- a/modules/interface/files/interface-rps.py
+++ b/modules/interface/files/interface-rps.py
@@ -244,13 +244,18 @@
def get_options(device):
"""Get configured options from /etc/interface-rps.d/$device"""
+ opts = {
+ 'rss_pattern': None,
+ 'qdisc': None,
+ }
config_file = os.path.join('/etc/interface-rps.d/', device)
if os.path.isfile(config_file):
config = ConfigParser.SafeConfigParser()
- config.read([config_file])
- opts = dict(config.items('Options'))
- else:
- opts = {}
+ config.read(config_file)
+ if config.has_option('Options', 'rss_pattern'):
+ opts['rss_pattern'] = config.get('Options', 'rss_pattern')
+ if config.has_option('Options', 'qdisc'):
+ opts['qdisc'] = config.get('Options', 'qdisc')
return opts
@@ -264,7 +269,7 @@
opts = get_options(device)
- if 'rss_pattern' in opts:
+ if opts['rss_pattern']:
rss_pattern = opts['rss_pattern']
else:
rss_pattern = detect_rss_pattern(device)
@@ -297,7 +302,7 @@
tx_queue_map = {rxq: None for rxq in rx_queues}
dist_queues_to_cpus(device, cpu_list, rx_queues, rx_irqs, tx_queue_map)
- if 'qdisc' in opts:
+ if opts['qdisc']:
setup_qdisc(device, len(tx_queues), opts['qdisc'])
--
To view, visit https://gerrit.wikimedia.org/r/355789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ddb8adc1a7fe66fcd9663461ae99d7f96853364
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
