From 65e0f34ea85974e281cffd688869567c5a06cd26 Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Wed, 13 Feb 2013 19:35:03 -0800 Subject: [PATCH] ovs-bugtool: Don't run a few ethtool commands on virtual devices. There can be a few hundred virtual interfaces in a hypervisor. Some of the ethtool commands that we currently run on these devices probably does not provide any extra information. So remove them for tap and vif interfaces. Also bump up the size limitation for CAP_NETWORK_STATUS. The current value is quite low and a 50 MB limit pre-compression does not add much to the overall size. Signed-off-by: Gurucharan Shetty --- utilities/bugtool/ovs-bugtool.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in index 3461735ea..ce6e43759 100755 --- a/utilities/bugtool/ovs-bugtool.in +++ b/utilities/bugtool/ovs-bugtool.in @@ -275,7 +275,7 @@ cap(CAP_MULTIPATH, PII_MAYBE, max_size=20*KB, max_time=10) cap(CAP_NETWORK_CONFIG, PII_IF_CUSTOMIZED, min_size=0, max_size=40*KB) -cap(CAP_NETWORK_STATUS, PII_YES, max_size=50*KB, +cap(CAP_NETWORK_STATUS, PII_YES, max_size=50*MB, max_time=30) cap(CAP_OPENVSWITCH_LOGS, PII_MAYBE, max_size=-1, max_time=5) @@ -600,11 +600,12 @@ exclude those logs from the archive. f.close() if os.path.islink('/sys/class/net/%s/device' % p) and int(t) == 1: # ARPHRD_ETHER - cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, p]) cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-S', p]) - cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-k', p]) - cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-i', p]) - cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-c', p]) + if not p.startswith('vif') and not p.startswith('tap'): + cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, p]) + cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-k', p]) + cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-i', p]) + cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-c', p]) if int(t) == 1: cmd_output(CAP_NETWORK_STATUS, [TC, '-s', '-d', 'class', 'show', 'dev', p]) -- 2.47.0