* [PATCH] nfsiostat/mountstats: handle KeyError in compare_iostats()
@ 2020-07-08 16:06 Kenneth D'souza
2020-07-17 13:55 ` Steve Dickson
0 siblings, 1 reply; 2+ messages in thread
From: Kenneth D'souza @ 2020-07-08 16:06 UTC (permalink / raw)
To: linux-nfs; +Cc: SteveD, kdsouza
This will prevent a backtrace like this from occurring if nfsiostat is run
with <interval> <count>, eg: nfsiostat 1 3
This issue can occur if old_stats.__rpc_data['ops'] keys are not up to
date with result.__rpc_data['ops'].
I belive this issue can also affect mountstats due to similar code,
hence fix it too.
nfsiostat:217:compare_iostats:KeyError: 'NULL'
Traceback (most recent call last):
File "/usr/sbin/nfsiostat", line 649, in <module>
iostat_command(prog)
File "/usr/sbin/nfsiostat", line 617, in iostat_command
print_iostat_summary(old_mountstats, mountstats, devices, sample_time, options)
File "/usr/sbin/nfsiostat", line 468, in print_iostat_summary
diff_stats[device] = stats[device].compare_iostats(old_stats)
File "/usr/sbin/nfsiostat", line 217, in compare_iostats
difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
KeyError: 'NULL'
Signed-off-by: Kenneth D'souza <kdsouza@redhat.com>
---
tools/mountstats/mountstats.py | 5 ++++-
tools/nfs-iostat/nfs-iostat.py | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
index 014f38a3..1054f698 100755
--- a/tools/mountstats/mountstats.py
+++ b/tools/mountstats/mountstats.py
@@ -560,7 +560,10 @@ class DeviceData:
# the reference to them. so we build new lists here
# for the result object.
for op in result.__rpc_data['ops']:
- result.__rpc_data[op] = list(map(difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
+ try:
+ result.__rpc_data[op] = list(map(difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
+ except KeyError:
+ continue
# update the remaining keys
if protocol == 'udp':
diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
index b7e98a2a..5556f692 100755
--- a/tools/nfs-iostat/nfs-iostat.py
+++ b/tools/nfs-iostat/nfs-iostat.py
@@ -213,8 +213,11 @@ class DeviceData:
# the reference to them. so we build new lists here
# for the result object.
for op in result.__rpc_data['ops']:
- result.__rpc_data[op] = list(map(
- difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
+ try:
+ result.__rpc_data[op] = list(map(
+ difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
+ except KeyError:
+ continue
# update the remaining keys we care about
result.__rpc_data['rpcsends'] -= old_stats.__rpc_data['rpcsends']
--
2.21.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] nfsiostat/mountstats: handle KeyError in compare_iostats()
2020-07-08 16:06 [PATCH] nfsiostat/mountstats: handle KeyError in compare_iostats() Kenneth D'souza
@ 2020-07-17 13:55 ` Steve Dickson
0 siblings, 0 replies; 2+ messages in thread
From: Steve Dickson @ 2020-07-17 13:55 UTC (permalink / raw)
To: Kenneth D'souza, linux-nfs
On 7/8/20 12:06 PM, Kenneth D'souza wrote:
> This will prevent a backtrace like this from occurring if nfsiostat is run
> with <interval> <count>, eg: nfsiostat 1 3
> This issue can occur if old_stats.__rpc_data['ops'] keys are not up to
> date with result.__rpc_data['ops'].
> I belive this issue can also affect mountstats due to similar code,
> hence fix it too.
>
> nfsiostat:217:compare_iostats:KeyError: 'NULL'
>
> Traceback (most recent call last):
> File "/usr/sbin/nfsiostat", line 649, in <module>
> iostat_command(prog)
> File "/usr/sbin/nfsiostat", line 617, in iostat_command
> print_iostat_summary(old_mountstats, mountstats, devices, sample_time, options)
> File "/usr/sbin/nfsiostat", line 468, in print_iostat_summary
> diff_stats[device] = stats[device].compare_iostats(old_stats)
> File "/usr/sbin/nfsiostat", line 217, in compare_iostats
> difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
> KeyError: 'NULL'
>
> Signed-off-by: Kenneth D'souza <kdsouza@redhat.com>
Committed... (tag: nfs-utils-2-5-2-rc2
steved.
> ---
> tools/mountstats/mountstats.py | 5 ++++-
> tools/nfs-iostat/nfs-iostat.py | 7 +++++--
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
> index 014f38a3..1054f698 100755
> --- a/tools/mountstats/mountstats.py
> +++ b/tools/mountstats/mountstats.py
> @@ -560,7 +560,10 @@ class DeviceData:
> # the reference to them. so we build new lists here
> # for the result object.
> for op in result.__rpc_data['ops']:
> - result.__rpc_data[op] = list(map(difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
> + try:
> + result.__rpc_data[op] = list(map(difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
> + except KeyError:
> + continue
>
> # update the remaining keys
> if protocol == 'udp':
> diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
> index b7e98a2a..5556f692 100755
> --- a/tools/nfs-iostat/nfs-iostat.py
> +++ b/tools/nfs-iostat/nfs-iostat.py
> @@ -213,8 +213,11 @@ class DeviceData:
> # the reference to them. so we build new lists here
> # for the result object.
> for op in result.__rpc_data['ops']:
> - result.__rpc_data[op] = list(map(
> - difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
> + try:
> + result.__rpc_data[op] = list(map(
> + difference, self.__rpc_data[op], old_stats.__rpc_data[op]))
> + except KeyError:
> + continue
>
> # update the remaining keys we care about
> result.__rpc_data['rpcsends'] -= old_stats.__rpc_data['rpcsends']
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-17 13:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-08 16:06 [PATCH] nfsiostat/mountstats: handle KeyError in compare_iostats() Kenneth D'souza
2020-07-17 13:55 ` Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).