From: Scott Mayhew <smayhew@redhat.com>
To: linux-nfs@vger.kernel.org
Subject: [nfs-utils RFC PATCH 10/15] mountstats: Fix IndexError in __parse_nfs_line
Date: Wed, 5 Nov 2014 12:01:07 -0500 [thread overview]
Message-ID: <1415206872-864-11-git-send-email-smayhew@redhat.com> (raw)
In-Reply-To: <1415206872-864-1-git-send-email-smayhew@redhat.com>
If __parse_nfs_line is is called on a line that has 'fstype nfsd', it'll
raise an IndexError trying to parse a nonexistent statvers entry.
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
tools/mountstats/mountstats.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
index b3231b2..77975ad 100755
--- a/tools/mountstats/mountstats.py
+++ b/tools/mountstats/mountstats.py
@@ -215,13 +215,13 @@ class DeviceData:
self.__nfs_data['export'] = words[1]
self.__nfs_data['mountpoint'] = words[4]
self.__nfs_data['fstype'] = words[7]
- if words[7].find('nfs') != -1:
+ if words[7].find('nfs') != -1 and words[7] != 'nfsd':
self.__nfs_data['statvers'] = words[8]
elif 'nfs' in words or 'nfs4' in words:
self.__nfs_data['export'] = words[0]
self.__nfs_data['mountpoint'] = words[3]
self.__nfs_data['fstype'] = words[6]
- if words[6].find('nfs') != -1:
+ if words[6].find('nfs') != -1 and words[6] != 'nfsd':
self.__nfs_data['statvers'] = words[7]
elif words[0] == 'age:':
self.__nfs_data['age'] = int(words[1])
--
1.9.3
next prev parent reply other threads:[~2014-11-05 17:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-05 17:00 [nfs-utils RFC PATCH 00/15] A few enhancements to mountstats.py Scott Mayhew
2014-11-05 17:00 ` [nfs-utils RFC PATCH 01/15] mountstats: Fix up NFS event counters Scott Mayhew
2014-11-05 17:00 ` [nfs-utils RFC PATCH 02/15] mountstats: Add lists of various counters Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 03/15] mountstats: Refactor __parse_nfs_line and __parse_rpc_line Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 04/15] mountstats: Refactor compare_iostats Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 05/15] mountstats: Convert existing option parsing to use the getopt module Scott Mayhew
2014-11-06 1:52 ` Chuck Lever
2014-11-06 14:44 ` Scott Mayhew
2014-11-06 15:02 ` Chuck Lever
2014-11-05 17:01 ` [nfs-utils RFC PATCH 06/15] mountstats: Make ms-iostat output match that of nfs-iostat.py Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 07/15] mountstats: Make print_iostat_summary handle newly appearing mounts Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 08/15] mountstats: Add support for -f/--file to the mountstats and ms-iostat commands Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 09/15] mountstats: Add support for -S/--since " Scott Mayhew
2014-11-06 1:50 ` Chuck Lever
2014-11-06 14:40 ` Scott Mayhew
2014-11-06 15:02 ` Chuck Lever
2014-11-05 17:01 ` Scott Mayhew [this message]
2014-11-05 17:01 ` [nfs-utils RFC PATCH 11/15] mountstats: Allow mountstats_command to take a variable number of mountpoints Scott Mayhew
2014-11-06 2:09 ` Chuck Lever
2014-11-06 14:46 ` Scott Mayhew
2014-11-06 14:58 ` Chuck Lever
2014-11-05 17:01 ` [nfs-utils RFC PATCH 12/15] mountstats: Add support for -R/--raw to mountstats_command Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 13/15] mountstats: Implement nfsstat_command Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 14/15] mountstats: Remove the --start and --end options Scott Mayhew
2014-11-05 17:01 ` [nfs-utils RFC PATCH 15/15] mountstats: Update the help output Scott Mayhew
2014-11-05 18:08 ` [nfs-utils RFC PATCH 00/15] A few enhancements to mountstats.py Chuck Lever
2014-11-05 22:07 ` Scott Mayhew
2014-11-05 20:34 ` Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415206872-864-11-git-send-email-smayhew@redhat.com \
--to=smayhew@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox