mountstats: Fix nfsstat command to handle RPC iostats version >= 1.1
diff mbox series

Message ID 20190626170259.8347-1-dwysocha@redhat.com
State New
Headers show
Series
  • mountstats: Fix nfsstat command to handle RPC iostats version >= 1.1
Related show

Commit Message

Dave Wysochanski June 26, 2019, 5:02 p.m. UTC
Later kernels with RPC iostats version >= 1.1 have an additional errors
count for each op.  Lengthen the array of values created inside
DeviceData and then in __parse_rpc_line just zero this value out for
prior kernels where this count is not present.  The count is not used
for nfsstat, but this keeps DeviceData consistent with the new count
as well as proper functioning of accumulate_iostats.

Before this patch, nfsstat will backtrace on a kernel with RPC iostats
version >= 1.1 due to the fixed array inside DeviceData.  This patch
fixes this backtrace and also allows nfsstat to work with these new
kernels.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
---
 tools/mountstats/mountstats.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Steve Dickson Aug. 1, 2019, 4:13 p.m. UTC | #1
On 6/26/19 1:02 PM, Dave Wysochanski wrote:
> Later kernels with RPC iostats version >= 1.1 have an additional errors
> count for each op.  Lengthen the array of values created inside
> DeviceData and then in __parse_rpc_line just zero this value out for
> prior kernels where this count is not present.  The count is not used
> for nfsstat, but this keeps DeviceData consistent with the new count
> as well as proper functioning of accumulate_iostats.
> 
> Before this patch, nfsstat will backtrace on a kernel with RPC iostats
> version >= 1.1 due to the fixed array inside DeviceData.  This patch
> fixes this backtrace and also allows nfsstat to work with these new
> kernels.
> 
> Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Committed... 

steved
> ---
>  tools/mountstats/mountstats.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
> index c5e8f506..6ac83ccb 100755
> --- a/tools/mountstats/mountstats.py
> +++ b/tools/mountstats/mountstats.py
> @@ -308,6 +308,8 @@ class DeviceData:
>              op = words[0][:-1]
>              self.__rpc_data['ops'] += [op]
>              self.__rpc_data[op] = [int(word) for word in words[1:]]
> +            if len(self.__rpc_data[op]) < 9:
> +                self.__rpc_data[op] += [0]
>  
>      def parse_stats(self, lines):
>          """Turn a list of lines from a mount stat file into a 
> @@ -582,7 +584,7 @@ class DeviceData:
>              self.__nfs_data['fstype'] = 'nfs4'
>          self.__rpc_data['ops'] = ops
>          for op in ops:
> -            self.__rpc_data[op] = [0 for i in range(8)]
> +            self.__rpc_data[op] = [0 for i in range(9)]
>  
>      def accumulate_iostats(self, new_stats):
>          """Accumulate counters from all RPC op buckets in new_stats.  This is
>

Patch
diff mbox series

diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
index c5e8f506..6ac83ccb 100755
--- a/tools/mountstats/mountstats.py
+++ b/tools/mountstats/mountstats.py
@@ -308,6 +308,8 @@  class DeviceData:
             op = words[0][:-1]
             self.__rpc_data['ops'] += [op]
             self.__rpc_data[op] = [int(word) for word in words[1:]]
+            if len(self.__rpc_data[op]) < 9:
+                self.__rpc_data[op] += [0]
 
     def parse_stats(self, lines):
         """Turn a list of lines from a mount stat file into a 
@@ -582,7 +584,7 @@  class DeviceData:
             self.__nfs_data['fstype'] = 'nfs4'
         self.__rpc_data['ops'] = ops
         for op in ops:
-            self.__rpc_data[op] = [0 for i in range(8)]
+            self.__rpc_data[op] = [0 for i in range(9)]
 
     def accumulate_iostats(self, new_stats):
         """Accumulate counters from all RPC op buckets in new_stats.  This is